openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r738220 [1/2] - in /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: ./ annotation/ component/ component/xml/ config/ container/ context/ context/creational/ context/type/ decorator/ deployment/ ejb/ el/ event/ ...
Date Tue, 27 Jan 2009 20:16:11 GMT
Author: gerdogdu
Date: Tue Jan 27 20:16:09 2009
New Revision: 738220

URL: http://svn.apache.org/viewvc?rev=738220&view=rev
Log:
Update implementation to reflect API changes.

Added:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentConstructorException.java
      - copied, changed from r738186, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentConstructorException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentFieldException.java
      - copied, changed from r738186, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentFieldException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMemberException.java
      - copied, changed from r738186, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMemberException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMethodException.java
      - copied, changed from r738186, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMethodException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentTypeException.java
      - copied, changed from r738186, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentTypeException.java
Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeansConstants.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedManagerLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/Component.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagerComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/DeploymentTypeManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/ejb/EJBLookUp.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalNotifier.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansNameSpaceContainer.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeansConstants.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeansConstants.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeansConstants.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeansConstants.java Tue Jan 27 20:16:09 2009
@@ -37,7 +37,7 @@
     public static final String CLASSPATH_URI_SCHEMA = "classpath:";
 
     /** WebBeans namespace */
-    public static final String WEB_BEANS_NAMESPACE = "urn:java:javax.webbeans";
+    public static final String WEB_BEANS_NAMESPACE = "urn:java:ee";
 
     /** <Deploy> XML Element */
     public static final String WEB_BEANS_XML_DEPLOY_ELEMENT = "Deploy";

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java Tue Jan 27 20:16:09 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.annotation;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.RequestScoped;
+import javax.context.ApplicationScoped;
+import javax.context.RequestScoped;
+import javax.inject.AnnotationLiteral;
 
 /**
  * {@link RequestScoped} literal annotation.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java Tue Jan 27 20:16:09 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.annotation;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Current;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Current;
 
 /**
  * {@link Current} literal annotation.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java Tue Jan 27 20:16:09 2009
@@ -13,10 +13,10 @@
  */
 package org.apache.webbeans.annotation;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Current;
-import javax.webbeans.Dependent;
-import javax.webbeans.RequestScoped;
+import javax.context.Dependent;
+import javax.context.RequestScoped;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Current;
 
 /**
  * {@link Dependent} literal annotation.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java Tue Jan 27 20:16:09 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.annotation;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Production;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Production;
 
 /**
  * {@link Production} literal annotation.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java Tue Jan 27 20:16:09 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.annotation;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Standard;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Standard;
 
 /**
  * {@link Standard} literal annotation.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedManagerLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedManagerLiteral.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedManagerLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedManagerLiteral.java Tue Jan 27 20:16:09 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.annotation;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.manager.Initialized;
+import javax.inject.AnnotationLiteral;
+import javax.inject.manager.Initialized;
 
 public class InitializedManagerLiteral extends AnnotationLiteral<Initialized> implements Initialized
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java Tue Jan 27 20:16:09 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.annotation;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Current;
-import javax.webbeans.New;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Current;
+import javax.inject.New;
 
 /**
  * {@link New} literal annotation.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java Tue Jan 27 20:16:09 2009
@@ -15,8 +15,8 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Production;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Production;
 
 public class ProductionLiteral extends AnnotationLiteral<Production> implements Production
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java Tue Jan 27 20:16:09 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.annotation;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Current;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Current;
 
 /**
  * {@link RequestScoped} literal annotation.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java Tue Jan 27 20:16:09 2009
@@ -13,10 +13,10 @@
  */
 package org.apache.webbeans.annotation;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Current;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.SessionScoped;
+import javax.context.RequestScoped;
+import javax.context.SessionScoped;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Current;
 
 /**
  * {@link RequestScoped} literal annotation.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java Tue Jan 27 20:16:09 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.annotation;
 
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Standard;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Standard;
 
 public class StandardLiteral extends AnnotationLiteral<Standard> implements Standard
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java Tue Jan 27 20:16:09 2009
@@ -21,7 +21,7 @@
 
 import javassist.util.proxy.MethodHandler;
 
-import javax.webbeans.ExecutionException;
+import javax.inject.ExecutionException;
 
 import org.apache.webbeans.util.Asserts;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java Tue Jan 27 20:16:09 2009
@@ -22,11 +22,11 @@
 import java.util.Set;
 import java.util.WeakHashMap;
 
-import javax.webbeans.CreationException;
-import javax.webbeans.Dependent;
-import javax.webbeans.InjectionPoint;
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.CreationalContext;
+import javax.context.CreationalContext;
+import javax.context.Dependent;
+import javax.inject.CreationException;
+import javax.inject.manager.Bean;
+import javax.inject.manager.InjectionPoint;
 
 import org.apache.webbeans.container.ManagerImpl;
 import org.apache.webbeans.context.DependentContext;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/Component.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/Component.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/Component.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/Component.java Tue Jan 27 20:16:09 2009
@@ -17,9 +17,9 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.webbeans.InjectionPoint;
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.Manager;
+import javax.inject.manager.Bean;
+import javax.inject.manager.InjectionPoint;
+import javax.inject.manager.Manager;
 
 import org.apache.webbeans.intercept.InterceptorData;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java Tue Jan 27 20:16:09 2009
@@ -20,8 +20,8 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.webbeans.Decorates;
-import javax.webbeans.manager.CreationalContext;
+import javax.context.CreationalContext;
+import javax.decorator.Decorates;
 
 import org.apache.webbeans.config.DefinitionUtil;
 import org.apache.webbeans.exception.WebBeansException;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java Tue Jan 27 20:16:09 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.component;
 
-import javax.webbeans.Conversation;
-import javax.webbeans.manager.CreationalContext;
+import javax.context.Conversation;
+import javax.context.CreationalContext;
 
 import org.apache.webbeans.jsf.ConversationImpl;
 import org.apache.webbeans.jsf.ConversationManager;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagerComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagerComponentImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagerComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagerComponentImpl.java Tue Jan 27 20:16:09 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.component;
 
-import javax.webbeans.manager.CreationalContext;
-import javax.webbeans.manager.Manager;
+import javax.context.CreationalContext;
+import javax.inject.manager.Manager;
 
 import org.apache.webbeans.container.ManagerImpl;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewComponentImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewComponentImpl.java Tue Jan 27 20:16:09 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.component;
 
-import javax.webbeans.New;
-import javax.webbeans.manager.CreationalContext;
+import javax.context.CreationalContext;
+import javax.inject.New;
 
 /**
  * Component definition with {@link New} binding annotation.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java Tue Jan 27 20:16:09 2009
@@ -16,8 +16,8 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import javax.webbeans.New;
-import javax.webbeans.manager.CreationalContext;
+import javax.context.CreationalContext;
+import javax.inject.New;
 
 import org.apache.webbeans.exception.WebBeansException;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java Tue Jan 27 20:16:09 2009
@@ -17,11 +17,11 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.IllegalProductException;
-import javax.webbeans.ScopeType;
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.CreationalContext;
+import javax.context.CreationalContext;
+import javax.context.Dependent;
+import javax.context.ScopeType;
+import javax.inject.IllegalProductException;
+import javax.inject.manager.Bean;
 
 import org.apache.webbeans.container.ManagerImpl;
 import org.apache.webbeans.exception.WebBeansConfigurationException;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java Tue Jan 27 20:16:09 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.component;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 /**
  * There are different <i>Web Beans Component</i> with regard to the definition.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java Tue Jan 27 20:16:09 2009
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.webbeans.manager.CreationalContext;
+import javax.context.CreationalContext;
 
 import org.apache.webbeans.component.ComponentImpl;
 import org.apache.webbeans.exception.WebBeansException;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java Tue Jan 27 20:16:09 2009
@@ -17,8 +17,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.manager.CreationalContext;
+import javax.context.CreationalContext;
+import javax.context.Dependent;
 
 import org.apache.webbeans.component.AbstractComponent;
 import org.apache.webbeans.component.ProducerComponentImpl;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java Tue Jan 27 20:16:09 2009
@@ -22,19 +22,18 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.webbeans.DeploymentType;
-import javax.webbeans.Destructor;
-import javax.webbeans.Disposes;
-import javax.webbeans.Initializer;
-import javax.webbeans.Named;
-import javax.webbeans.NonBinding;
-import javax.webbeans.Fires;
-import javax.webbeans.Observes;
-import javax.webbeans.Produces;
-import javax.webbeans.ScopeType;
-import javax.webbeans.Specializes;
-import javax.webbeans.UnsatisfiedDependencyException;
-import javax.webbeans.manager.Bean;
+import javax.annotation.Named;
+import javax.annotation.NonBinding;
+import javax.context.ScopeType;
+import javax.event.Fires;
+import javax.event.Observes;
+import javax.inject.DeploymentType;
+import javax.inject.Disposes;
+import javax.inject.Initializer;
+import javax.inject.Produces;
+import javax.inject.Specializes;
+import javax.inject.UnsatisfiedDependencyException;
+import javax.inject.manager.Bean;
 
 import org.apache.webbeans.annotation.CurrentLiteral;
 import org.apache.webbeans.annotation.DependentScopeLiteral;
@@ -506,7 +505,7 @@
                     WebBeansUtil.checkForNewBindingForDeployment(t, clazz, method.getName(), a);
                 }
 
-                if (method.getAnnotation(Produces.class) == null && method.getAnnotation(Destructor.class) == null)
+                if (method.getAnnotation(Produces.class) == null)
                 {
                     WebBeansUtil.checkInjectedMethodParameterConditions(method, clazz);
                     if (!Modifier.isStatic(method.getModifiers()))

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java Tue Jan 27 20:16:09 2009
@@ -16,9 +16,9 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import javax.webbeans.Decorator;
-import javax.webbeans.Interceptor;
-import javax.webbeans.ScopeType;
+import javax.context.ScopeType;
+import javax.decorator.Decorator;
+import javax.interceptor.Interceptor;
 
 import org.apache.webbeans.component.ComponentImpl;
 import org.apache.webbeans.component.ProducerComponentImpl;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java Tue Jan 27 20:16:09 2009
@@ -19,13 +19,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.webbeans.Decorator;
-import javax.webbeans.InconsistentSpecializationException;
-import javax.webbeans.Interceptor;
-import javax.webbeans.ScopeType;
-import javax.webbeans.Specializes;
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.Manager;
+import javax.context.ScopeType;
+import javax.decorator.Decorator;
+import javax.inject.InconsistentSpecializationException;
+import javax.inject.Specializes;
+import javax.inject.manager.Bean;
+import javax.inject.manager.Manager;
+import javax.interceptor.Interceptor;
 
 import org.apache.webbeans.WebBeansConstants;
 import org.apache.webbeans.annotation.InitializedManagerLiteral;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java Tue Jan 27 20:16:09 2009
@@ -43,6 +43,8 @@
     public static final String SINGLETON_INJECTION_RESOLVER = "org.apache.webbeans.container.InjectionResolver";
     
     public static final String SINGLETON_SESSION_CONTEXT_MANAGER = "org.apache.webbeans.context.SessionContextManager";
+    
+    public static final String SINGLETON_WEBBEANS_NAMESPACE_CONTAINER = "org.apache.webbeans.xml.WebBeansNameSpaceContainer";
 
     private static Map<String, Map<ClassLoader, Object>> singletonMap = new HashMap<String, Map<ClassLoader, Object>>();
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Tue Jan 27 20:16:09 2009
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.webbeans.manager.Bean;
+import javax.inject.manager.Bean;
 
 import org.apache.webbeans.annotation.CurrentLiteral;
 import org.apache.webbeans.component.ProducerComponentImpl;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java Tue Jan 27 20:16:09 2009
@@ -27,23 +27,23 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import javax.context.Context;
+import javax.context.ContextNotActiveException;
+import javax.context.CreationalContext;
+import javax.context.Dependent;
+import javax.event.Observer;
+import javax.inject.AmbiguousDependencyException;
+import javax.inject.TypeLiteral;
+import javax.inject.manager.Bean;
+import javax.inject.manager.Decorator;
+import javax.inject.manager.InjectionPoint;
+import javax.inject.manager.InterceptionType;
+import javax.inject.manager.Interceptor;
+import javax.inject.manager.Manager;
 import javax.naming.NamingException;
 import javax.naming.Reference;
 import javax.naming.Referenceable;
 import javax.naming.StringRefAddr;
-import javax.webbeans.AmbiguousDependencyException;
-import javax.webbeans.ContextNotActiveException;
-import javax.webbeans.Dependent;
-import javax.webbeans.InjectionPoint;
-import javax.webbeans.Observer;
-import javax.webbeans.TypeLiteral;
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.Context;
-import javax.webbeans.manager.CreationalContext;
-import javax.webbeans.manager.Decorator;
-import javax.webbeans.manager.InterceptionType;
-import javax.webbeans.manager.Interceptor;
-import javax.webbeans.manager.Manager;
 
 import org.apache.webbeans.component.AbstractComponent;
 import org.apache.webbeans.config.WebBeansFinder;
@@ -403,7 +403,7 @@
         return getManager().webBeansDecorators;
     }
 
-    private void addContext(Class<? extends Annotation> scopeType, javax.webbeans.manager.Context context)
+    private void addContext(Class<? extends Annotation> scopeType, javax.context.Context context)
     {
         Asserts.assertNotNull(scopeType, "scopeType parameter can not be null");
         Asserts.assertNotNull(context, "context parameter can not be null");

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java Tue Jan 27 20:16:09 2009
@@ -17,10 +17,10 @@
 import java.lang.reflect.ParameterizedType;
 import java.util.Set;
 
-import javax.webbeans.AmbiguousDependencyException;
-import javax.webbeans.ScopeType;
-import javax.webbeans.UnsatisfiedDependencyException;
-import javax.webbeans.manager.Bean;
+import javax.context.ScopeType;
+import javax.inject.AmbiguousDependencyException;
+import javax.inject.UnsatisfiedDependencyException;
+import javax.inject.manager.Bean;
 
 import org.apache.webbeans.util.AnnotationUtil;
 import org.apache.webbeans.util.Asserts;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Tue Jan 27 20:16:09 2009
@@ -19,16 +19,16 @@
 import java.util.Set;
 import java.util.Map.Entry;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.ContextNotActiveException;
-import javax.webbeans.ConversationScoped;
-import javax.webbeans.Dependent;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.SessionScoped;
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.Contextual;
-import javax.webbeans.manager.CreationalContext;
-import javax.webbeans.manager.Manager;
+import javax.context.ApplicationScoped;
+import javax.context.ContextNotActiveException;
+import javax.context.Contextual;
+import javax.context.ConversationScoped;
+import javax.context.CreationalContext;
+import javax.context.Dependent;
+import javax.context.RequestScoped;
+import javax.context.SessionScoped;
+import javax.inject.manager.Bean;
+import javax.inject.manager.Manager;
 
 import org.apache.webbeans.context.type.ContextTypes;
 import org.apache.webbeans.exception.ContextRemoveException;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java Tue Jan 27 20:16:09 2009
@@ -15,7 +15,7 @@
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.webbeans.manager.Contextual;
+import javax.context.Contextual;
 
 import org.apache.webbeans.context.type.ContextTypes;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java Tue Jan 27 20:16:09 2009
@@ -15,15 +15,15 @@
 
 import java.lang.annotation.Annotation;
 
+import javax.context.ApplicationScoped;
+import javax.context.ContextNotActiveException;
+import javax.context.ConversationScoped;
+import javax.context.Dependent;
+import javax.context.RequestScoped;
+import javax.context.SessionScoped;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.ContextNotActiveException;
-import javax.webbeans.ConversationScoped;
-import javax.webbeans.Dependent;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.SessionScoped;
 
 import org.apache.webbeans.context.type.ContextTypes;
 import org.apache.webbeans.jsf.ConversationManager;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java Tue Jan 27 20:16:09 2009
@@ -15,7 +15,7 @@
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.webbeans.manager.Contextual;
+import javax.context.Contextual;
 
 import org.apache.webbeans.context.type.ContextTypes;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java Tue Jan 27 20:16:09 2009
@@ -13,11 +13,11 @@
  */
 package org.apache.webbeans.context;
 
-import javax.webbeans.ContextNotActiveException;
-import javax.webbeans.Dependent;
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.Contextual;
-import javax.webbeans.manager.CreationalContext;
+import javax.context.ContextNotActiveException;
+import javax.context.Contextual;
+import javax.context.CreationalContext;
+import javax.context.Dependent;
+import javax.inject.manager.Bean;
 
 import org.apache.webbeans.component.AbstractComponent;
 import org.apache.webbeans.context.type.ContextTypes;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java Tue Jan 27 20:16:09 2009
@@ -15,7 +15,7 @@
 
 import java.util.HashMap;
 
-import javax.webbeans.manager.Contextual;
+import javax.context.Contextual;
 
 import org.apache.webbeans.context.type.ContextTypes;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java Tue Jan 27 20:16:09 2009
@@ -15,7 +15,7 @@
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.webbeans.manager.Contextual;
+import javax.context.Contextual;
 
 import org.apache.webbeans.context.type.ContextTypes;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java Tue Jan 27 20:16:09 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.context;
 
-import javax.webbeans.manager.Bean;
+import javax.inject.manager.Bean;
 
-public interface WebBeansContext extends javax.webbeans.manager.Context
+public interface WebBeansContext extends javax.context.Context
 {
     /**
      * Removes the given web beans component from the context.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Tue Jan 27 20:16:09 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.webbeans.context.creational;
 
-import javax.webbeans.manager.CreationalContext;
+import javax.context.CreationalContext;
 
 /** {@inheritDoc} */
 public class CreationalContextImpl<T> implements CreationalContext<T>

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java Tue Jan 27 20:16:09 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.context.type;
 
-import javax.webbeans.manager.Context;
+import javax.context.Context;
 
 /**
  * Defines the enumaration of the standart context types in the web beans

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java Tue Jan 27 20:16:09 2009
@@ -16,7 +16,7 @@
 import java.io.Serializable;
 import java.util.Comparator;
 
-import javax.webbeans.manager.Decorator;
+import javax.inject.manager.Decorator;
 
 public class DecoratorComparator implements Comparator<Decorator>, Serializable
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java Tue Jan 27 20:16:09 2009
@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.webbeans.Decorates;
-import javax.webbeans.manager.Decorator;
+import javax.decorator.Decorates;
+import javax.inject.manager.Decorator;
 
 import org.apache.webbeans.component.ComponentImpl;
 import org.apache.webbeans.container.ManagerImpl;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java Tue Jan 27 20:16:09 2009
@@ -20,10 +20,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.webbeans.Decorates;
-import javax.webbeans.InjectionPoint;
-import javax.webbeans.manager.CreationalContext;
-import javax.webbeans.manager.Decorator;
+import javax.context.CreationalContext;
+import javax.decorator.Decorates;
+import javax.inject.manager.Decorator;
+import javax.inject.manager.InjectionPoint;
 
 import org.apache.webbeans.component.AbstractComponent;
 import org.apache.webbeans.component.ComponentImpl;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java Tue Jan 27 20:16:09 2009
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.webbeans.manager.Decorator;
+import javax.inject.manager.Decorator;
 
 import org.apache.webbeans.annotation.CurrentLiteral;
 import org.apache.webbeans.component.AbstractComponent;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/DeploymentTypeManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/DeploymentTypeManager.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/DeploymentTypeManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/DeploymentTypeManager.java Tue Jan 27 20:16:09 2009
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.webbeans.Standard;
+import javax.inject.Standard;
 
 import org.apache.webbeans.config.WebBeansFinder;
 import org.apache.webbeans.util.Asserts;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java Tue Jan 27 20:16:09 2009
@@ -21,9 +21,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.webbeans.DeploymentType;
-import javax.webbeans.ScopeType;
-import javax.webbeans.Stereotype;
+import javax.annotation.Stereotype;
+import javax.context.ScopeType;
+import javax.inject.DeploymentType;
 
 import org.apache.webbeans.deployment.stereotype.IStereoTypeModel;
 import org.apache.webbeans.exception.WebBeansConfigurationException;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java Tue Jan 27 20:16:09 2009
@@ -20,13 +20,13 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.webbeans.DeploymentType;
-import javax.webbeans.Named;
-import javax.webbeans.NonexistentTypeException;
-import javax.webbeans.ScopeType;
+import javax.annotation.Named;
+import javax.context.ScopeType;
+import javax.inject.DeploymentType;
 
 import org.apache.webbeans.deployment.stereotype.IStereoTypeModel;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
+import org.apache.webbeans.exception.definition.NonexistentTypeException;
 import org.apache.webbeans.proxy.JavassistProxyFactory;
 import org.apache.webbeans.util.AnnotationUtil;
 import org.apache.webbeans.xml.XMLUtil;
@@ -70,13 +70,13 @@
                 Class<?> clazz = XMLUtil.getElementJavaType(child);
                 if (clazz == null)
                 {
-                    throw new NonexistentTypeException(errorMessage + "Type is not exist with class name : " + XMLUtil.getElementJavaClassName(child));
+                    throw new NonexistentTypeException(errorMessage + "Type is not exist with class name : " + XMLUtil.getElementJavaClassName(child) + " in namespace : " + XMLUtil.getElementNameSpace(child) );
                 }
 
                 Class<? extends Annotation> annClazz = null;
                 if (!clazz.isAnnotation())
                 {
-                    throw new WebBeansConfigurationException(errorMessage + "Type is not annotation type with class name : " + XMLUtil.getElementJavaClassName(child));
+                    throw new WebBeansConfigurationException(errorMessage + "Type is not annotation type with class name : " + XMLUtil.getElementJavaClassName(child) +  " in namespace : " + XMLUtil.getElementNameSpace(child));
                 }
 
                 annClazz = (Class<? extends Annotation>) clazz;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/ejb/EJBLookUp.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/ejb/EJBLookUp.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/ejb/EJBLookUp.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/ejb/EJBLookUp.java Tue Jan 27 20:16:09 2009
@@ -13,15 +13,7 @@
  */
 package org.apache.webbeans.ejb;
 
-import javax.webbeans.manager.EnterpriseBeanLookup;
-
-/**
- * This class is used for looking the EJBs in the container.
- * 
- * @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
- * @since 1.0
- */
-public class EJBLookUp implements EnterpriseBeanLookup
+public class EJBLookUp
 {
 
     /**

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java Tue Jan 27 20:16:09 2009
@@ -16,14 +16,14 @@
 import java.beans.FeatureDescriptor;
 import java.util.Iterator;
 
+import javax.context.Dependent;
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ELResolver;
 import javax.el.PropertyNotFoundException;
 import javax.el.PropertyNotWritableException;
-import javax.webbeans.Dependent;
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.Manager;
+import javax.inject.manager.Bean;
+import javax.inject.manager.Manager;
 
 import org.apache.webbeans.container.ManagerImpl;
 import org.apache.webbeans.context.DependentContext;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java Tue Jan 27 20:16:09 2009
@@ -21,10 +21,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.Observer;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Context;
+import javax.context.Context;
+import javax.context.Dependent;
+import javax.event.Observer;
+import javax.event.Observes;
 
 import org.apache.webbeans.annotation.CurrentLiteral;
 import org.apache.webbeans.component.AbstractComponent;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java Tue Jan 27 20:16:09 2009
@@ -17,9 +17,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
+import javax.event.Event;
+import javax.event.Fires;
+import javax.event.Observer;
 
 import org.apache.webbeans.container.ManagerImpl;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java Tue Jan 27 20:16:09 2009
@@ -18,16 +18,15 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
-import javax.webbeans.AfterTransactionCompletion;
-import javax.webbeans.AfterTransactionFailure;
-import javax.webbeans.AfterTransactionSuccess;
-import javax.webbeans.BeforeTransactionCompletion;
-import javax.webbeans.Destructor;
-import javax.webbeans.Disposes;
-import javax.webbeans.Event;
-import javax.webbeans.Initializer;
-import javax.webbeans.Observes;
-import javax.webbeans.Produces;
+import javax.event.AfterTransactionCompletion;
+import javax.event.AfterTransactionFailure;
+import javax.event.AfterTransactionSuccess;
+import javax.event.BeforeTransactionCompletion;
+import javax.event.Event;
+import javax.event.Observes;
+import javax.inject.Disposes;
+import javax.inject.Initializer;
+import javax.inject.Produces;
 
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.util.AnnotationUtil;
@@ -91,7 +90,7 @@
             throw new WebBeansConfigurationException("Observer method : " + candidateObserverMethod.getName() + " in class : " + clazz.getName() + " can not define two parameters with annotated @Observes");
         }
 
-        if (AnnotationUtil.isMethodHasAnnotation(candidateObserverMethod, Produces.class) || AnnotationUtil.isMethodHasAnnotation(candidateObserverMethod, Initializer.class) || AnnotationUtil.isMethodHasAnnotation(candidateObserverMethod, Destructor.class))
+        if (AnnotationUtil.isMethodHasAnnotation(candidateObserverMethod, Produces.class) || AnnotationUtil.isMethodHasAnnotation(candidateObserverMethod, Initializer.class))
         {
             throw new WebBeansConfigurationException("Observer method : " + candidateObserverMethod.getName() + " in class : " + clazz.getName() + " can not annotated with annotation in the list {@Produces, @Initializer, @Destructor}");
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Tue Jan 27 20:16:09 2009
@@ -22,14 +22,14 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import javax.event.IfExists;
+import javax.event.Observer;
+import javax.event.ObserverException;
+import javax.event.Observes;
+import javax.inject.TypeLiteral;
 import javax.transaction.Status;
 import javax.transaction.Synchronization;
 import javax.transaction.Transaction;
-import javax.webbeans.IfExists;
-import javax.webbeans.Observer;
-import javax.webbeans.ObserverException;
-import javax.webbeans.Observes;
-import javax.webbeans.TypeLiteral;
 
 import org.apache.webbeans.component.ObservesMethodsOwner;
 import org.apache.webbeans.config.WebBeansFinder;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverImpl.java Tue Jan 27 20:16:09 2009
@@ -18,7 +18,7 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.webbeans.Observer;
+import javax.event.Observer;
 
 import org.apache.webbeans.util.AnnotationUtil;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalNotifier.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalNotifier.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalNotifier.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalNotifier.java Tue Jan 27 20:16:09 2009
@@ -17,7 +17,7 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.webbeans.Observer;
+import javax.event.Observer;
 
 import org.apache.webbeans.util.Asserts;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java Tue Jan 27 20:16:09 2009
@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.webbeans.manager.Manager;
+import javax.inject.manager.Manager;
 
 import org.apache.webbeans.component.ObservesMethodsOwner;
 import org.apache.webbeans.container.InjectionResolver;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java Tue Jan 27 20:16:09 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.exception;
 
-import javax.webbeans.DefinitionException;
+import javax.inject.DefinitionException;
 
 /**
  * Exception that is thrown by the web beans container at the intialization

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentConstructorException.java (from r738186, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentConstructorException.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentConstructorException.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentConstructorException.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentConstructorException.java&r1=738186&r2=738220&rev=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentConstructorException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentConstructorException.java Tue Jan 27 20:16:09 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.webbeans;
+package org.apache.webbeans.exception.definition;
+
+import javax.inject.DefinitionException;
 
 public class NonexistentConstructorException extends DefinitionException
 {

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentFieldException.java (from r738186, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentFieldException.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentFieldException.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentFieldException.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentFieldException.java&r1=738186&r2=738220&rev=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentFieldException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentFieldException.java Tue Jan 27 20:16:09 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.webbeans;
+package org.apache.webbeans.exception.definition;
+
+import javax.inject.DefinitionException;
 
 public class NonexistentFieldException extends DefinitionException
 {

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMemberException.java (from r738186, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMemberException.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMemberException.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMemberException.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMemberException.java&r1=738186&r2=738220&rev=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMemberException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMemberException.java Tue Jan 27 20:16:09 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.webbeans;
+package org.apache.webbeans.exception.definition;
+
+import javax.inject.DefinitionException;
 
 public class NonexistentMemberException extends DefinitionException
 {

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMethodException.java (from r738186, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMethodException.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMethodException.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMethodException.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMethodException.java&r1=738186&r2=738220&rev=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentMethodException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMethodException.java Tue Jan 27 20:16:09 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.webbeans;
+package org.apache.webbeans.exception.definition;
+
+import javax.inject.DefinitionException;
 
 public class NonexistentMethodException extends DefinitionException
 {

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentTypeException.java (from r738186, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentTypeException.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentTypeException.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentTypeException.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentTypeException.java&r1=738186&r2=738220&rev=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/webbeans/NonexistentTypeException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentTypeException.java Tue Jan 27 20:16:09 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.webbeans;
+package org.apache.webbeans.exception.definition;
+
+import javax.inject.DefinitionException;
 
 public class NonexistentTypeException extends DefinitionException
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java Tue Jan 27 20:16:09 2009
@@ -18,10 +18,10 @@
 import java.lang.reflect.Type;
 import java.util.Set;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.New;
-import javax.webbeans.Fires;
-import javax.webbeans.manager.Bean;
+import javax.context.Dependent;
+import javax.event.Fires;
+import javax.inject.New;
+import javax.inject.manager.Bean;
 
 import org.apache.webbeans.component.AbstractComponent;
 import org.apache.webbeans.container.InjectionResolver;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java Tue Jan 27 20:16:09 2009
@@ -15,7 +15,7 @@
 
 import java.util.Comparator;
 
-import javax.webbeans.manager.Interceptor;
+import javax.inject.manager.Interceptor;
 
 import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java Tue Jan 27 20:16:09 2009
@@ -18,11 +18,11 @@
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+import javax.inject.manager.Interceptor;
 import javax.interceptor.AroundInvoke;
+import javax.interceptor.InterceptorBindingType;
 import javax.interceptor.Interceptors;
 
-import javax.webbeans.InterceptorBindingType;
-import javax.webbeans.manager.Interceptor;
 
 /**
  * Web Beans general interceptor API contract. There are two types of

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java Tue Jan 27 20:16:09 2009
@@ -18,8 +18,8 @@
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+import javax.inject.manager.Interceptor;
 import javax.interceptor.AroundInvoke;
-import javax.webbeans.manager.Interceptor;
 
 /**
  * Abstract implementation of the {@link InterceptorData} api contract.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java Tue Jan 27 20:16:09 2009
@@ -19,9 +19,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.context.Context;
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.Interceptors;
-import javax.webbeans.manager.Context;
 
 import org.apache.webbeans.component.AbstractComponent;
 import org.apache.webbeans.container.ManagerImpl;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java Tue Jan 27 20:16:09 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.intercept;
 
-import javax.webbeans.manager.InterceptionType;
+import javax.inject.manager.InterceptionType;
 
 import org.apache.webbeans.exception.WebBeansException;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java?rev=738220&r1=738219&r2=738220&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java Tue Jan 27 20:16:09 2009
@@ -22,15 +22,13 @@
 import javax.annotation.PreDestroy;
 import javax.ejb.PostActivate;
 import javax.ejb.PrePassivate;
-import javax.ejb.Remove;
+import javax.event.Observes;
+import javax.inject.Disposes;
+import javax.inject.Initializer;
+import javax.inject.Produces;
+import javax.inject.manager.InterceptionType;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Destructor;
-import javax.webbeans.Disposes;
-import javax.webbeans.Initializer;
-import javax.webbeans.Observes;
-import javax.webbeans.Produces;
-import javax.webbeans.manager.InterceptionType;
 
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.WebBeansException;
@@ -61,11 +59,6 @@
             return false;
         }
 
-        if (AnnotationUtil.isMethodHasAnnotation(method, Destructor.class) || AnnotationUtil.isMethodHasAnnotation(method, Remove.class))
-        {
-            return false;
-        }
-
         if (AnnotationUtil.isMethodHasAnnotation(method, PreDestroy.class) || AnnotationUtil.isMethodHasAnnotation(method, PostConstruct.class) || AnnotationUtil.isMethodHasAnnotation(method, AroundInvoke.class))
         {
             return false;



Mime
View raw message