[cdi-api] 03/10: Merge tag 'upstream/1.2'

Markus Koschany apo-guest at moszumanska.debian.org
Tue Sep 30 16:08:33 UTC 2014


This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch experimental
in repository cdi-api.

commit 7499c09d4bcc5691baa13cc66e1abfb575ba9b58
Merge: 0577b6c eff8960
Author: Markus Koschany <apo at gambaru.de>
Date:   Tue Sep 30 12:53:27 2014 +0200

    Merge tag 'upstream/1.2'
    
    Upstream version 1.2
    
    # gpg: Signature made Tue 30 Sep 2014 12:53:23 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 META-INF/DEPENDENCIES.txt                          |  22 +
 META-INF/LICENSE.txt                               | 201 +++++++
 META-INF/MANIFEST.MF                               |   6 +
 beans_1_0.xsd                                      | 181 ++++++
 beans_1_1.xsd                                      | 355 ++++++++++++
 .../decorator/Decorator.java                       |  46 +-
 {src/javax => javax}/decorator/Delegate.java       |  44 +-
 {src/javax => javax}/decorator/package-info.java   |  16 +
 javax/enterprise/context/ApplicationScoped.java    |  88 +++
 .../context/BusyConversationException.java         |  59 ++
 .../enterprise/context/ContextException.java       |  52 +-
 .../context/ContextNotActiveException.java         |  52 +-
 javax/enterprise/context/Conversation.java         | 112 ++++
 javax/enterprise/context/ConversationScoped.java   | 142 +++++
 javax/enterprise/context/Dependent.java            | 103 ++++
 javax/enterprise/context/Destroyed.java            |  37 ++
 javax/enterprise/context/Initialized.java          |  36 ++
 .../context/NonexistentConversationException.java  |  47 +-
 .../enterprise/context/NormalScope.java            |  35 +-
 javax/enterprise/context/RequestScoped.java        |  90 +++
 javax/enterprise/context/SessionScoped.java        |  81 +++
 .../enterprise/context/package-info.java           |  19 +-
 javax/enterprise/context/spi/AlterableContext.java |  46 ++
 javax/enterprise/context/spi/Context.java          |  94 ++++
 javax/enterprise/context/spi/Contextual.java       |  57 ++
 .../enterprise/context/spi/CreationalContext.java  |  46 ++
 .../enterprise/context/spi/package-info.java       |  35 +-
 javax/enterprise/event/Event.java                  | 140 +++++
 .../enterprise/event/ObserverException.java        |  38 +-
 javax/enterprise/event/Observes.java               | 109 ++++
 javax/enterprise/event/Reception.java              |  55 ++
 javax/enterprise/event/TransactionPhase.java       |  74 +++
 .../enterprise/event/package-info.java             |  16 +
 javax/enterprise/inject/Alternative.java           |  66 +++
 .../inject/AmbiguousResolutionException.java       |  49 +-
 {src/javax => javax}/enterprise/inject/Any.java    |  44 +-
 .../enterprise/inject/CreationException.java       |  52 +-
 .../enterprise/inject/Decorated.java               |  53 +-
 .../enterprise/inject/Default.java                 |  68 ++-
 javax/enterprise/inject/Disposes.java              | 120 ++++
 .../enterprise/inject/IllegalProductException.java |  51 +-
 .../enterprise/inject/InjectionException.java      |  46 +-
 javax/enterprise/inject/Instance.java              | 207 +++++++
 .../enterprise/inject/Intercepted.java             |  47 +-
 .../enterprise/inject/Model.java                   |  47 +-
 javax/enterprise/inject/New.java                   |  86 +++
 javax/enterprise/inject/Produces.java              | 121 ++++
 .../enterprise/inject/ResolutionException.java     |  48 +-
 javax/enterprise/inject/Specializes.java           |  70 +++
 javax/enterprise/inject/Stereotype.java            | 137 +++++
 .../enterprise/inject/TransientReference.java      |  44 +-
 {src/javax => javax}/enterprise/inject/Typed.java  |  39 +-
 .../inject/UnproxyableResolutionException.java     |  46 +-
 .../inject/UnsatisfiedResolutionException.java     |  44 +-
 javax/enterprise/inject/Vetoed.java                |  34 ++
 .../enterprise/inject/package-info.java            |  46 +-
 .../enterprise/inject/spi/AfterBeanDiscovery.java  | 110 ++++
 .../inject/spi/AfterDeploymentValidation.java      |  31 +-
 .../enterprise/inject/spi/AfterTypeDiscovery.java  |  62 +++
 javax/enterprise/inject/spi/Annotated.java         |  85 +++
 .../enterprise/inject/spi/AnnotatedCallable.java   |  23 +-
 .../inject/spi/AnnotatedConstructor.java           |  23 +-
 .../enterprise/inject/spi/AnnotatedField.java      |  22 +-
 .../enterprise/inject/spi/AnnotatedMember.java     |  52 +-
 .../enterprise/inject/spi/AnnotatedMethod.java     |  23 +-
 .../enterprise/inject/spi/AnnotatedParameter.java  |  39 +-
 javax/enterprise/inject/spi/AnnotatedType.java     |  71 +++
 javax/enterprise/inject/spi/Bean.java              |  66 +++
 javax/enterprise/inject/spi/BeanAttributes.java    |  59 ++
 javax/enterprise/inject/spi/BeanManager.java       | 606 +++++++++++++++++++++
 .../enterprise/inject/spi/BeforeBeanDiscovery.java | 174 ++++++
 .../enterprise/inject/spi/BeforeShutdown.java      |  11 +-
 javax/enterprise/inject/spi/CDI.java               | 152 ++++++
 javax/enterprise/inject/spi/CDIProvider.java       |  18 +
 javax/enterprise/inject/spi/Decorator.java         |  64 +++
 .../enterprise/inject/spi/DefinitionException.java |  42 ++
 .../enterprise/inject/spi/DeploymentException.java |  42 ++
 javax/enterprise/inject/spi/EventMetadata.java     |  62 +++
 javax/enterprise/inject/spi/Extension.java         |  47 ++
 javax/enterprise/inject/spi/InjectionPoint.java    | 123 +++++
 javax/enterprise/inject/spi/InjectionTarget.java   |  67 +++
 .../inject/spi/InjectionTargetFactory.java         |  42 ++
 .../enterprise/inject/spi/InterceptionType.java    |  64 ++-
 javax/enterprise/inject/spi/Interceptor.java       |  73 +++
 javax/enterprise/inject/spi/ObserverMethod.java    |  88 +++
 .../enterprise/inject/spi/PassivationCapable.java  |  34 +-
 .../inject/spi/ProcessAnnotatedType.java           |  71 +++
 javax/enterprise/inject/spi/ProcessBean.java       |  78 +++
 .../inject/spi/ProcessBeanAttributes.java          |  59 ++
 .../inject/spi/ProcessInjectionPoint.java          |  49 ++
 .../inject/spi/ProcessInjectionTarget.java         |  83 +++
 .../enterprise/inject/spi/ProcessManagedBean.java  |  28 +-
 .../inject/spi/ProcessObserverMethod.java          |  67 +++
 javax/enterprise/inject/spi/ProcessProducer.java   |  85 +++
 .../inject/spi/ProcessProducerField.java           |  55 ++
 .../inject/spi/ProcessProducerMethod.java          |  53 ++
 .../enterprise/inject/spi/ProcessSessionBean.java  |  56 ++
 .../inject/spi/ProcessSyntheticAnnotatedType.java  |  45 ++
 javax/enterprise/inject/spi/Producer.java          |  80 +++
 javax/enterprise/inject/spi/ProducerFactory.java   |  41 ++
 .../enterprise/inject/spi/SessionBeanType.java     |  31 +-
 javax/enterprise/inject/spi/Unmanaged.java         | 166 ++++++
 javax/enterprise/inject/spi/WithAnnotations.java   |  32 ++
 .../enterprise/inject/spi/package-info.java        |  19 +-
 javax/enterprise/util/AnnotationLiteral.java       | 296 ++++++++++
 .../enterprise/util/Nonbinding.java                |  25 +-
 javax/enterprise/util/TypeLiteral.java             | 132 +++++
 .../enterprise/util/package-info.java              |   0
 src/META-INF/MANIFEST.MF                           |   4 -
 src/beans.xsd                                      |  65 ---
 src/javax/decorator/Decorator.java                 |  56 --
 .../enterprise/context/ApplicationScoped.java      |  76 ---
 .../context/BusyConversationException.java         |  62 ---
 src/javax/enterprise/context/Conversation.java     | 104 ----
 .../enterprise/context/ConversationScoped.java     | 126 -----
 src/javax/enterprise/context/Dependent.java        | 109 ----
 src/javax/enterprise/context/RequestScoped.java    |  76 ---
 src/javax/enterprise/context/SessionScoped.java    |  62 ---
 src/javax/enterprise/context/spi/Context.java      |  88 ---
 src/javax/enterprise/context/spi/Contextual.java   |  65 ---
 .../enterprise/context/spi/CreationalContext.java  |  48 --
 src/javax/enterprise/context/spi/package-info.java |  17 -
 src/javax/enterprise/event/Event.java              | 124 -----
 src/javax/enterprise/event/Observes.java           |  89 ---
 src/javax/enterprise/event/Reception.java          |  48 --
 src/javax/enterprise/event/TransactionPhase.java   |  69 ---
 src/javax/enterprise/inject/Alternative.java       |  72 ---
 src/javax/enterprise/inject/CreationException.java |  53 --
 src/javax/enterprise/inject/Default.java           |  87 ---
 src/javax/enterprise/inject/Disposes.java          |  89 ---
 .../enterprise/inject/IllegalProductException.java |  50 --
 src/javax/enterprise/inject/Instance.java          | 172 ------
 src/javax/enterprise/inject/Model.java             |  32 --
 src/javax/enterprise/inject/New.java               |  84 ---
 src/javax/enterprise/inject/Produces.java          |  96 ----
 .../enterprise/inject/ResolutionException.java     |  50 --
 src/javax/enterprise/inject/Specializes.java       |  78 ---
 src/javax/enterprise/inject/Stereotype.java        | 126 -----
 .../enterprise/inject/spi/AfterBeanDiscovery.java  |  92 ----
 src/javax/enterprise/inject/spi/Annotated.java     |  80 ---
 src/javax/enterprise/inject/spi/AnnotatedType.java |  63 ---
 src/javax/enterprise/inject/spi/Bean.java          | 111 ----
 src/javax/enterprise/inject/spi/BeanManager.java   | 372 -------------
 .../enterprise/inject/spi/BeforeBeanDiscovery.java |  84 ---
 src/javax/enterprise/inject/spi/Decorator.java     |  58 --
 src/javax/enterprise/inject/spi/Extension.java     |  44 --
 .../enterprise/inject/spi/InjectionPoint.java      | 121 ----
 .../enterprise/inject/spi/InjectionTarget.java     |  73 ---
 .../enterprise/inject/spi/InterceptionType.java    |  60 --
 src/javax/enterprise/inject/spi/Interceptor.java   |  67 ---
 .../enterprise/inject/spi/ObserverMethod.java      |  64 ---
 .../inject/spi/ProcessAnnotatedType.java           |  73 ---
 src/javax/enterprise/inject/spi/ProcessBean.java   |  84 ---
 .../inject/spi/ProcessInjectionTarget.java         |  91 ----
 .../inject/spi/ProcessObserverMethod.java          |  66 ---
 .../enterprise/inject/spi/ProcessProducer.java     |  94 ----
 .../inject/spi/ProcessProducerField.java           |  44 --
 .../inject/spi/ProcessProducerMethod.java          |  52 --
 .../enterprise/inject/spi/ProcessSessionBean.java  |  49 --
 src/javax/enterprise/inject/spi/Producer.java      |  91 ----
 src/javax/enterprise/util/AnnotationLiteral.java   | 349 ------------
 src/javax/enterprise/util/TypeLiteral.java         | 149 -----
 162 files changed, 7309 insertions(+), 5424 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/cdi-api.git



More information about the pkg-java-commits mailing list