openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r782251 [1/2] - in /incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax: annotation/ context/ decorator/ enterprise/ enterprise/context/ enterprise/context/spi/ enterprise/event/ enterprise/inject/ enterprise/inject/deployment/ en...
Date Sat, 06 Jun 2009 12:59:26 GMT
Author: gerdogdu
Date: Sat Jun  6 12:59:23 2009
New Revision: 782251

URL: http://svn.apache.org/viewvc?rev=782251&view=rev
Log:
Updating JSR-299 API

Added:
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ApplicationScoped.java
      - copied, changed from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ApplicationScoped.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ContextNotActiveException.java
      - copied, changed from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ContextNotActiveException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Conversation.java
      - copied, changed from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Conversation.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ConversationScoped.java
      - copied, changed from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ConversationScoped.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Dependent.java
      - copied, changed from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Dependent.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/RequestScoped.java
      - copied, changed from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/RequestScoped.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ScopeType.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ScopeType.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/SessionScoped.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/SessionScoped.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Context.java
      - copied, changed from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Context.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Contextual.java
      - copied, changed from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Contextual.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/CreationalContext.java
      - copied, changed from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/CreationalContext.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionCompletion.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionCompletion.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionFailure.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionFailure.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionSuccess.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionSuccess.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Asynchronously.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Asynchronously.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/BeforeTransactionCompletion.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/BeforeTransactionCompletion.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Event.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Event.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/IfExists.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/IfExists.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observer.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Observer.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/ObserverException.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/ObserverException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observes.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Observes.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java   (with props)
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/AnnotationLiteral.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/BindingType.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/BindingType.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/CreationException.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/CreationException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Current.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Current.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Disposes.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Disposes.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/DuplicateBindingTypeException.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/DuplicateBindingTypeException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/IllegalProductException.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/IllegalProductException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Initializer.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Initializer.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Instance.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Named.java
      - copied, changed from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/annotation/Named.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/New.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/New.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/NonBinding.java
      - copied, changed from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/annotation/NonBinding.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Produces.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Produces.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/TypeLiteral.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/TypeLiteral.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java   (with props)
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java   (with props)
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/DeploymentType.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Production.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Production.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Specializes.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Specializes.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Standard.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Standard.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Bean.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeanManager.java   (with props)
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Decorator.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/InjectionPoint.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Interceptor.java
      - copied, changed from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Model.java   (with props)
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Stereotype.java   (with props)
Removed:
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/annotation/
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionCompletion.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionFailure.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionSuccess.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Asynchronously.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/BeforeTransactionCompletion.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Event.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/IfExists.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Observer.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/ObserverException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Observes.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/AmbiguousDependencyException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/AnnotationLiteral.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/BindingType.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/CreationException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Current.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/DeploymentType.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Disposes.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/DuplicateBindingTypeException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/IllegalProductException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Initializer.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Instance.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/New.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Produces.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Production.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Specializes.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Standard.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/TypeLiteral.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/UnproxyableDependencyException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/UnsatisfiedDependencyException.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/InjectionPoint.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/
Modified:
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Fires.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Obtains.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Deployed.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Initialized.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/interceptor/Interceptor.java

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java?rev=782251&r1=782250&r2=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java Sat Jun  6 12:59:23 2009
@@ -20,7 +20,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.annotation.Stereotype;
+import javax.enterprise.inject.stereotype.Stereotype;
 
 @Target(value = ElementType.TYPE)
 @Retention(value = RetentionPolicy.RUNTIME)

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ApplicationScoped.java (from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ApplicationScoped.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ApplicationScoped.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ApplicationScoped.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ApplicationScoped.java&r1=771394&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ApplicationScoped.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ApplicationScoped.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.context;
+package javax.enterprise.context;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ContextNotActiveException.java (from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ContextNotActiveException.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ContextNotActiveException.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ContextNotActiveException.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ContextNotActiveException.java&r1=771394&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ContextNotActiveException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ContextNotActiveException.java Sat Jun  6 12:59:23 2009
@@ -11,8 +11,11 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.context;
+package javax.enterprise.context;
 
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
 import javax.inject.ExecutionException;
 
 /**

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Conversation.java (from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Conversation.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Conversation.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Conversation.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Conversation.java&r1=771394&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Conversation.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Conversation.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.context;
+package javax.enterprise.context;
 
 /**
  * Defines the conversation instance contract for using

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ConversationScoped.java (from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ConversationScoped.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ConversationScoped.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ConversationScoped.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ConversationScoped.java&r1=771394&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ConversationScoped.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ConversationScoped.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.context;
+package javax.enterprise.context;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Dependent.java (from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Dependent.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Dependent.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Dependent.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Dependent.java&r1=771394&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Dependent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Dependent.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.context;
+package javax.enterprise.context;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/RequestScoped.java (from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/RequestScoped.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/RequestScoped.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/RequestScoped.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/RequestScoped.java&r1=771394&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/RequestScoped.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/RequestScoped.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.context;
+package javax.enterprise.context;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ScopeType.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ScopeType.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ScopeType.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ScopeType.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ScopeType.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/ScopeType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ScopeType.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.context;
+package javax.enterprise.context;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/SessionScoped.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/SessionScoped.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/SessionScoped.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/SessionScoped.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/SessionScoped.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/SessionScoped.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/SessionScoped.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.context;
+package javax.enterprise.context;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.FIELD;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Context.java (from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Context.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Context.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Context.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Context.java&r1=771394&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Context.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Context.java Sat Jun  6 12:59:23 2009
@@ -11,10 +11,13 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.context;
+package javax.enterprise.context.spi;
 
 import java.lang.annotation.Annotation;
 
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.ScopeType;
+
 /**
  * Every webbeans component has an associated context that are
  * defined by the {@link ScopeType} annotation. Webbeans components

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Contextual.java (from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Contextual.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Contextual.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Contextual.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Contextual.java&r1=771394&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/Contextual.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Contextual.java Sat Jun  6 12:59:23 2009
@@ -11,9 +11,9 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.context;
+package javax.enterprise.context.spi;
 
-import javax.inject.CreationException;
+import javax.enterprise.inject.CreationException;
 
 /**
  * Each webbeans instance that is contained in the <code>Context</code>

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/CreationalContext.java (from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/CreationalContext.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/CreationalContext.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/CreationalContext.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/CreationalContext.java&r1=771394&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/context/CreationalContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/CreationalContext.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.context;
+package javax.enterprise.context.spi;
 
 /**
  * The CreationalContext holds incomplete Bean instances. This may be caused by

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionCompletion.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionCompletion.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionCompletion.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionCompletion.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionCompletion.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionCompletion.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionCompletion.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.event;
+package javax.enterprise.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionFailure.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionFailure.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionFailure.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionFailure.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionFailure.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionFailure.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionFailure.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.event;
+package javax.enterprise.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionSuccess.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionSuccess.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionSuccess.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionSuccess.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionSuccess.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/AfterTransactionSuccess.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/AfterTransactionSuccess.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.event;
+package javax.enterprise.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Asynchronously.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Asynchronously.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Asynchronously.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Asynchronously.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Asynchronously.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Asynchronously.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Asynchronously.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.event;
+package javax.enterprise.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/BeforeTransactionCompletion.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/BeforeTransactionCompletion.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/BeforeTransactionCompletion.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/BeforeTransactionCompletion.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/BeforeTransactionCompletion.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/BeforeTransactionCompletion.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/BeforeTransactionCompletion.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.event;
+package javax.enterprise.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Event.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Event.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Event.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Event.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Event.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Event.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Event.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.event;
+package javax.enterprise.event;
 
 import java.lang.annotation.Annotation;
 

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/IfExists.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/IfExists.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/IfExists.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/IfExists.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/IfExists.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/IfExists.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/IfExists.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.event;
+package javax.enterprise.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observer.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Observer.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observer.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observer.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Observer.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Observer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observer.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.event;
+package javax.enterprise.event;
 
 public interface Observer<T>
 {

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/ObserverException.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/ObserverException.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/ObserverException.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/ObserverException.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/ObserverException.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/ObserverException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/ObserverException.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.event;
+package javax.enterprise.event;
 
 import javax.inject.ExecutionException;
 

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observes.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Observes.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observes.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observes.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Observes.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/event/Observes.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observes.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.event;
+package javax.enterprise.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

Added: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java?rev=782251&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java (added)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java Sat Jun  6 12:59:23 2009
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package javax.enterprise.inject;
+
+import javax.inject.DeploymentException;
+
+public class AmbiguousResolutionException extends DeploymentException
+{
+    private static final long serialVersionUID = -870939668365532685L;
+
+    public AmbiguousResolutionException()
+    {
+        super();
+    }
+
+    public AmbiguousResolutionException(String message)
+    {
+        super(message);
+    }
+
+    public AmbiguousResolutionException(Throwable e)
+    {
+        super(e);
+    }
+
+    public AmbiguousResolutionException(String message, Throwable e)
+    {
+        super(message, e);
+    }
+
+}

Propchange: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/AnnotationLiteral.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/AnnotationLiteral.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/AnnotationLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java Sat Jun  6 12:59:23 2009
@@ -11,13 +11,15 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
+import javax.inject.ExecutionException;
+
 
 @SuppressWarnings("unchecked")
 public abstract class AnnotationLiteral<T extends Annotation> implements Annotation

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/BindingType.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/BindingType.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/BindingType.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/BindingType.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/BindingType.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/BindingType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/BindingType.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/CreationException.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/CreationException.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/CreationException.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/CreationException.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/CreationException.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/CreationException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/CreationException.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,9 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
+
+import javax.inject.ExecutionException;
 
 public class CreationException extends ExecutionException
 {

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Current.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Current.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Current.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Current.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Current.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Current.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Current.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Disposes.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Disposes.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Disposes.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Disposes.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Disposes.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Disposes.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Disposes.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/DuplicateBindingTypeException.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/DuplicateBindingTypeException.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/DuplicateBindingTypeException.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/DuplicateBindingTypeException.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/DuplicateBindingTypeException.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/DuplicateBindingTypeException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/DuplicateBindingTypeException.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,9 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
+
+import javax.inject.ExecutionException;
 
 public class DuplicateBindingTypeException extends ExecutionException
 {

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/IllegalProductException.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/IllegalProductException.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/IllegalProductException.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/IllegalProductException.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/IllegalProductException.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/IllegalProductException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/IllegalProductException.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,9 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
+
+import javax.inject.ExecutionException;
 
 public class IllegalProductException extends ExecutionException
 {

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Initializer.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Initializer.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Initializer.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Initializer.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Initializer.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Initializer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Initializer.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Instance.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Instance.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Instance.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
 
 import java.lang.annotation.Annotation;
 

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Named.java (from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/annotation/Named.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Named.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Named.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/annotation/Named.java&r1=771394&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/annotation/Named.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Named.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.annotation;
+package javax.enterprise.inject;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/New.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/New.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/New.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/New.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/New.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/New.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/New.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/NonBinding.java (from r771394, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/annotation/NonBinding.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/NonBinding.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/NonBinding.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/annotation/NonBinding.java&r1=771394&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/annotation/NonBinding.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/NonBinding.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.annotation;
+package javax.enterprise.inject;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Produces.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Produces.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Produces.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Produces.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Produces.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Produces.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Produces.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.FIELD;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/TypeLiteral.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/TypeLiteral.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/TypeLiteral.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/TypeLiteral.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/TypeLiteral.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/TypeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/TypeLiteral.java Sat Jun  6 12:59:23 2009
@@ -11,12 +11,14 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
+import javax.inject.ExecutionException;
+
 
 @SuppressWarnings("unchecked")
 public abstract class TypeLiteral<T>

Added: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java?rev=782251&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java (added)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java Sat Jun  6 12:59:23 2009
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package javax.enterprise.inject;
+
+import javax.inject.DeploymentException;
+
+public class UnproxyableResolutionException extends DeploymentException
+{
+    private static final long serialVersionUID = 7022231794856380239L;
+
+    public UnproxyableResolutionException()
+    {
+        super();
+    }
+
+    public UnproxyableResolutionException(String message)
+    {
+        super(message);
+    }
+
+    public UnproxyableResolutionException(Throwable e)
+    {
+        super(e);
+    }
+
+    public UnproxyableResolutionException(String message, Throwable e)
+    {
+        super(message, e);
+    }
+
+}

Propchange: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java?rev=782251&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java (added)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java Sat Jun  6 12:59:23 2009
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package javax.enterprise.inject;
+
+import javax.inject.DeploymentException;
+
+public class UnsatisfiedResolutionException extends DeploymentException
+{
+    private static final long serialVersionUID = 8476513814387375212L;
+
+    public UnsatisfiedResolutionException()
+    {
+        super();
+    }
+
+    public UnsatisfiedResolutionException(String message)
+    {
+        super(message);
+    }
+
+    public UnsatisfiedResolutionException(Throwable e)
+    {
+        super(e);
+    }
+
+    public UnsatisfiedResolutionException(String message, Throwable e)
+    {
+        super(message, e);
+    }
+
+}

Propchange: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/DeploymentType.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/DeploymentType.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/DeploymentType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject.deployment;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Production.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Production.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Production.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Production.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Production.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Production.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Production.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject.deployment;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Specializes.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Specializes.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Specializes.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Specializes.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Specializes.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Specializes.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Specializes.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject.deployment;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.ElementType.METHOD;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Standard.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Standard.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Standard.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Standard.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Standard.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/Standard.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Standard.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject;
+package javax.enterprise.inject.deployment;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Bean.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Bean.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Bean.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Bean.java Sat Jun  6 12:59:23 2009
@@ -11,24 +11,24 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject.manager;
+package javax.enterprise.inject.spi;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Set;
 
-import javax.context.Contextual;
+import javax.enterprise.context.spi.Contextual;
 
 public abstract class Bean<T> implements Contextual<T>
 {
-    private final Manager manager;
+    private final BeanManager manager;
 
-    protected Bean(Manager manager)
+    protected Bean(BeanManager manager)
     {
         this.manager = manager;
     }
 
-    protected Manager getManager()
+    protected BeanManager getManager()
     {
         return manager;
     }

Added: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeanManager.java?rev=782251&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeanManager.java (added)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeanManager.java Sat Jun  6 12:59:23 2009
@@ -0,0 +1,161 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package javax.enterprise.inject.spi;
+
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.event.Observer;
+import javax.enterprise.inject.TypeLiteral;
+
+
+/**
+ * The interface <code>Manager</code> provides operations for
+ * obtaining the contextual instance of the webbeans. There are operations
+ * related with;
+ * 
+ * <ul>
+ *  <li>Adding new webbeans</li>
+ *  <li>Adding new contexts</li>
+ *  <li>Adding new decorators</li>
+ *  <li>Adding new interceptors</li>
+ *  <li>Firing the observer events</li>
+ *  <li>Creating the instance of the contextual beans</li>
+ *  <li>Resolution of beans, interceptors, decorators and observers</li>
+ *  <li>Other utility methods etc..</li>
+ * </ul>
+ * 
+ * <p>
+ * There is always one root manager in the system. You can set the
+ * current activity via call to the {@link BeanManager#setCurrent(Class)} method.
+ * </p>
+ * 
+ * @version $Rev$ $Date$ 
+ */
+public interface BeanManager
+{
+    /**
+     * Resolve beans with given api type and bindings.
+     * 
+     * @param apiType api type of the bean
+     * @param bindings beans bindings
+     * @return the set of webbeans
+     */
+    public <T> Set<Bean<T>> resolveByType(Class<T> apiType, Annotation... bindings);
+
+    /**
+     * Resolves beans with given {@link TypeLiteral} generic type
+     * and binding types.
+     * 
+     * @param apiType bean api type
+     * @param bindingTypes bean binding types
+     * @return the set of resolved beans
+     */
+    public <T> Set<Bean<T>> resolveByType(TypeLiteral<T> apiType, Annotation... bindingTypes);
+
+    /**
+     * Gets bean instance using its context. 
+     * 
+     * @param type type of the bean
+     * @param bindingTypes binding types of the bean
+     * @return the bean instance
+     */
+    public <T> T getInstanceByType(Class<T> type, Annotation... bindingTypes);
+
+    /**
+     * Gets instance of the bean from its context.
+     * 
+     * @param type generic type of bean using {@link TypeLiteral}
+     * @param bindingTypes binding types
+     * @return instance of the bean
+     */
+    public <T> T getInstanceByType(TypeLiteral<T> type, Annotation... bindingTypes);
+
+    /**
+     * Resolves the set of beans with given name.
+     * 
+     * @param name name of the bean
+     * @return the set of resolved beans with given name
+     */
+    public Set<Bean<?>> resolveByName(String name);
+
+    /**
+     * Gets instance of the injection point.
+     * <p>
+     * See the specification section 5.7.1 Resolving dependencies.
+     * </p>
+     * 
+     * @param injectionPoint injection point definition
+     * @param context creational context instance
+     * @return instance of the injection point or null
+     */
+    public <T> T getInstanceToInject(InjectionPoint injectionPoint, CreationalContext<?> context);
+
+    public <T> T getInstanceToInject(InjectionPoint injectionPoint);
+
+    public Object getInstanceByName(String name);
+
+    public <T> T getInstance(Bean<T> bean);
+
+    public void fireEvent(Object event, Annotation... bindings);
+
+    public Context getContext(Class<? extends Annotation> scopeType);
+
+    /**
+     * Add new context to this activity.
+     * 
+     * @param context new context
+     * @return the this activity
+     */
+    public BeanManager addContext(Context context);
+
+    public BeanManager addBean(Bean<?> bean);
+
+    /**
+     * Adds new interceptor to this activity.
+     * 
+     * @param interceptor new interceptor
+     * @return the manager instance that this interceptor is added
+     */
+    public BeanManager addInterceptor(Interceptor interceptor);
+
+    public BeanManager addDecorator(Decorator decorator);
+
+    public <T> BeanManager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings);
+
+    public <T> BeanManager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings);
+
+    public <T> BeanManager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings);
+
+    public <T> BeanManager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings);
+
+    public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings);
+
+    public List<Interceptor> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings);
+
+    public List<Decorator> resolveDecorators(Set<Type> types, Annotation... bindingTypes);
+    
+    public BeanManager parse(InputStream xmlStream);
+    
+    public BeanManager createActivity();
+
+    public BeanManager setCurrent(Class<? extends Annotation> scopeType);
+    
+
+}
\ No newline at end of file

Propchange: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Decorator.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Decorator.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Decorator.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Decorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Decorator.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject.manager;
+package javax.enterprise.inject.spi;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;
@@ -19,7 +19,7 @@
 public abstract class Decorator extends Bean<Object>
 {
 
-    protected Decorator(Manager manager)
+    protected Decorator(BeanManager manager)
     {
         super(manager);
     }

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/InjectionPoint.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/InjectionPoint.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/InjectionPoint.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject.manager;
+package javax.enterprise.inject.spi;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/InterceptionType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject.manager;
+package javax.enterprise.inject.spi;
 
 public enum InterceptionType
 {

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Interceptor.java (from r767577, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Interceptor.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Interceptor.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java&r1=767577&r2=782251&rev=782251&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/inject/manager/Interceptor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Interceptor.java Sat Jun  6 12:59:23 2009
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package javax.inject.manager;
+package javax.enterprise.inject.spi;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -21,7 +21,7 @@
 public abstract class Interceptor extends Bean<Object>
 {
 
-    protected Interceptor(Manager manager)
+    protected Interceptor(BeanManager manager)
     {
         super(manager);
     }

Added: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Model.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Model.java?rev=782251&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Model.java (added)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Model.java Sat Jun  6 12:59:23 2009
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package javax.enterprise.inject.stereotype;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.deployment.Production;
+
+@Named
+@RequestScoped
+@Production
+@Stereotype
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Documented
+@Inherited
+public @interface Model
+{
+
+}

Propchange: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Model.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message