openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r833663 [2/2] - in /incubator/openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/annotation/ main/java/org/apache/webbeans/component/ main/java/org/apache/webbeans/config/ main/java/org/apache/webbeans/container/ main/java/...
Date Sat, 07 Nov 2009 09:53:00 GMT
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/EventTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/EventTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/EventTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/EventTest.java Sat Nov  7 09:52:57 2009
@@ -18,8 +18,8 @@
 import java.util.Set;
 
 import javax.enterprise.context.NormalScope;
-import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
 import javax.servlet.ServletContext;
 
 import org.apache.webbeans.event.NotificationManager;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/BrokenComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/BrokenComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/BrokenComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/BrokenComponentTest.java Sat Nov  7 09:52:57 2009
@@ -45,7 +45,7 @@
 
         try
         {
-            defineSimpleWebBean(BrokenObserverComponent1.class);
+            defineManagedBean(BrokenObserverComponent1.class);
 
         }
         catch (Exception e)
@@ -64,7 +64,7 @@
 
         try
         {
-            defineSimpleWebBean(BrokenObserverComponent2.class);
+            defineManagedBean(BrokenObserverComponent2.class);
 
         }
         catch (Exception e)
@@ -83,7 +83,7 @@
 
         try
         {
-            defineSimpleWebBean(BrokenObserverComponent3.class);
+            defineManagedBean(BrokenObserverComponent3.class);
 
         }
         catch (Exception e)
@@ -102,7 +102,7 @@
 
         try
         {
-            defineSimpleWebBean(BrokenObserverComponent4.class);
+            defineManagedBean(BrokenObserverComponent4.class);
 
         }
         catch (Exception e)
@@ -121,7 +121,7 @@
 
         try
         {
-            defineSimpleWebBean(BrokenObserverComponent5.class);
+            defineManagedBean(BrokenObserverComponent5.class);
 
         }
         catch (Exception e)
@@ -140,7 +140,7 @@
 
         try
         {
-            defineSimpleWebBean(BrokenObserverComponent6.class);
+            defineManagedBean(BrokenObserverComponent6.class);
 
         }
         catch (Exception e)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java Sat Nov  7 09:52:57 2009
@@ -15,7 +15,7 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 import junit.framework.Assert;
 
@@ -53,7 +53,7 @@
     {
         clear();
 
-        AbstractBean<ComponentWithObserves1> component = defineSimpleWebBean(ComponentWithObserves1.class);
+        AbstractBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
         ContextFactory.initRequestContext(null);
 
         LoggedInEvent event = new LoggedInEvent("Gurkan");
@@ -73,8 +73,8 @@
     {
         clear();
 
-        AbstractBean<ComponentWithObserves1> component = defineSimpleWebBean(ComponentWithObserves1.class);
-        AbstractBean<ComponentWithObservable1> componentObservable = defineSimpleWebBean(ComponentWithObservable1.class);
+        AbstractBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
+        AbstractBean<ComponentWithObservable1> componentObservable = defineManagedBean(ComponentWithObservable1.class);
 
         ContextFactory.initRequestContext(null);
 
@@ -91,7 +91,7 @@
     {
         clear();
 
-        AbstractBean<ComponentWithObserves1> component = defineSimpleWebBean(ComponentWithObserves1.class);
+        AbstractBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
         ContextFactory.initRequestContext(null);
 
         LoggedInEvent event = new LoggedInEvent("Gurkan");
@@ -123,7 +123,7 @@
     {
         clear();
 
-        AbstractBean<ComponentWithObserves1> component = defineSimpleWebBean(ComponentWithObserves1.class);
+        AbstractBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
         ContextFactory.initRequestContext(null);
 
         LoggedInEvent event = new LoggedInEvent("Mark");
@@ -145,10 +145,10 @@
     {
         clear();
 
-        defineSimpleWebBean(CheckWithCheckPayment.class);
-        defineSimpleWebBean(CheckWithMoneyPayment.class);
-        defineSimpleWebBean(PaymentProcessorComponent.class);
-        AbstractBean<ComponentWithObserves2> component = defineSimpleWebBean(ComponentWithObserves2.class);
+        defineManagedBean(CheckWithCheckPayment.class);
+        defineManagedBean(CheckWithMoneyPayment.class);
+        defineManagedBean(PaymentProcessorComponent.class);
+        AbstractBean<ComponentWithObserves2> component = defineManagedBean(ComponentWithObserves2.class);
         ContextFactory.initRequestContext(null);
 
         LoggedInEvent event = new LoggedInEvent("USER");

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/exception/EventExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/exception/EventExceptionTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/exception/EventExceptionTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/exception/EventExceptionTest.java Sat Nov  7 09:52:57 2009
@@ -18,7 +18,7 @@
 import java.util.Set;
 
 import javax.enterprise.context.NormalScope;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.servlet.ServletContext;
 
 import org.apache.webbeans.event.NotificationManager;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java Sat Nov  7 09:52:57 2009
@@ -80,7 +80,7 @@
         {
             OpenWebBeansConfiguration.getInstance().setProperty(OpenWebBeansConfiguration.USE_INJECTION_RESOLVER_VIA_ALTERNATIVE, "false");
             clear();
-            defineSimpleWebBean(ComponentTypeExceptionComponent.class);
+            defineManagedBean(ComponentTypeExceptionComponent.class);
         }
         catch (WebBeansConfigurationException e)
         {
@@ -102,7 +102,7 @@
         {
             OpenWebBeansConfiguration.getInstance().setProperty(OpenWebBeansConfiguration.USE_INJECTION_RESOLVER_VIA_ALTERNATIVE, "false");
             clear();
-            defineSimpleWebBean(ProducerTypeExceptionComponent.class);
+            defineManagedBean(ProducerTypeExceptionComponent.class);
 
         }
         catch (WebBeansConfigurationException e)
@@ -121,7 +121,7 @@
     public void testFinal()
     {
         clear();
-        defineSimpleWebBean(FinalComponent.class);
+        defineManagedBean(FinalComponent.class);
     }
 
     @Test
@@ -130,7 +130,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(AbstractBean.class);
+            defineManagedBean(AbstractBean.class);
         }
         catch (WebBeansConfigurationException e)
         {
@@ -146,7 +146,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(InnerInnerComponent.class);
+            defineManagedBean(InnerInnerComponent.class);
         }
         catch (WebBeansConfigurationException e)
         {
@@ -162,7 +162,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(HasFinalMethodComponent.class);
+            defineManagedBean(HasFinalMethodComponent.class);
         }
         catch (WebBeansConfigurationException e)
         {
@@ -178,7 +178,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(MoreThanOneConstructureComponent.class);
+            defineManagedBean(MoreThanOneConstructureComponent.class);
             Assert.fail("expecting an exception!");
         }
         catch (WebBeansConfigurationException e)
@@ -190,7 +190,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(MoreThanOneConstructureComponent2.class);
+            defineManagedBean(MoreThanOneConstructureComponent2.class);
             // all ok
         }
         catch (WebBeansConfigurationException e)
@@ -199,14 +199,14 @@
         }
 
         clear();
-        defineSimpleWebBean(NoConstructureComponent.class);
+        defineManagedBean(NoConstructureComponent.class);
     }
 
     @Test
     public void testStaticProducerMethod()
     {
         clear();
-        defineSimpleWebBean(ProducerTypeStaticComponent.class);
+        defineManagedBean(ProducerTypeStaticComponent.class);
     }
 
     @Test
@@ -215,7 +215,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(MultipleDisposalMethodComponent.class);
+            defineManagedBean(MultipleDisposalMethodComponent.class);
         }
         catch (WebBeansConfigurationException e)
         {
@@ -231,7 +231,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(NewComponentInterfaceComponent.class);
+            defineManagedBean(NewComponentInterfaceComponent.class);
         }
         catch (WebBeansConfigurationException e)
         {
@@ -247,7 +247,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(NewComponentBindingComponent.class);
+            defineManagedBean(NewComponentBindingComponent.class);
         }
         catch (WebBeansConfigurationException e)
         {
@@ -264,7 +264,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(NewMethodComponentBindingComponent.class);
+            defineManagedBean(NewMethodComponentBindingComponent.class);
 
         }
         catch (WebBeansConfigurationException e)
@@ -283,7 +283,7 @@
         try
         {
             clear();
-            AbstractBean<MoreThanOnePostConstructComponent> component = defineSimpleWebBean(MoreThanOnePostConstructComponent.class);
+            AbstractBean<MoreThanOnePostConstructComponent> component = defineManagedBean(MoreThanOnePostConstructComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -300,7 +300,7 @@
         try
         {
             clear();
-            AbstractBean<PostContructMethodHasParameterComponent> component = defineSimpleWebBean(PostContructMethodHasParameterComponent.class);
+            AbstractBean<PostContructMethodHasParameterComponent> component = defineManagedBean(PostContructMethodHasParameterComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -317,7 +317,7 @@
         try
         {
             clear();
-            AbstractBean<?> component = defineSimpleWebBean(PostContructMethodHasReturnTypeComponent.class);
+            AbstractBean<?> component = defineManagedBean(PostContructMethodHasReturnTypeComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -334,7 +334,7 @@
         try
         {
             clear();
-            AbstractBean<?> component = defineSimpleWebBean(PostContructMethodHasCheckedExceptionComponent.class);
+            AbstractBean<?> component = defineManagedBean(PostContructMethodHasCheckedExceptionComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -351,7 +351,7 @@
         try
         {
             clear();
-            AbstractBean<?> component = defineSimpleWebBean(PostContructMethodHasStaticComponent.class);
+            AbstractBean<?> component = defineManagedBean(PostContructMethodHasStaticComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -368,7 +368,7 @@
         try
         {
             clear();
-            AbstractBean<?> component = defineSimpleWebBean(MoreThanOneAroundInvokeComponent.class);
+            AbstractBean<?> component = defineManagedBean(MoreThanOneAroundInvokeComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -383,7 +383,7 @@
     public void testAroundInvokeWithSameMethodName()
     {
         clear();
-        defineSimpleWebBean(AroundInvokeWithSameMethodNameComponent.class);
+        defineManagedBean(AroundInvokeWithSameMethodNameComponent.class);
         Bean<?> comp = getComponents().get(0);
 
         Assert.assertEquals(0, ((AbstractBean<?>) comp).getInterceptorStack().size());
@@ -395,7 +395,7 @@
         try
         {
             clear();
-            AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithoutParameterComponent.class);
+            AbstractBean<?> component = defineManagedBean(AroundInvokeWithoutParameterComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -412,7 +412,7 @@
         try
         {
             clear();
-            AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithoutReturnTypeComponent.class);
+            AbstractBean<?> component = defineManagedBean(AroundInvokeWithoutReturnTypeComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -429,7 +429,7 @@
         try
         {
             clear();
-            AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithWrongReturnTypeComponent.class);
+            AbstractBean<?> component = defineManagedBean(AroundInvokeWithWrongReturnTypeComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -446,7 +446,7 @@
         try
         {
             clear();
-            AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithoutExceptionComponent.class);
+            AbstractBean<?> component = defineManagedBean(AroundInvokeWithoutExceptionComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -463,7 +463,7 @@
         try
         {
             clear();
-            AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithStaticMethodComponent.class);
+            AbstractBean<?> component = defineManagedBean(AroundInvokeWithStaticMethodComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -480,7 +480,7 @@
         try
         {
             clear();
-            AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithFinalMethodComponent.class);
+            AbstractBean<?> component = defineManagedBean(AroundInvokeWithFinalMethodComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)
@@ -497,7 +497,7 @@
         try
         {
             clear();
-            AbstractBean<?> component = defineSimpleWebBean(NoArgConstructorInterceptorComponent.class);
+            AbstractBean<?> component = defineManagedBean(NoArgConstructorInterceptorComponent.class);
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }
         catch (WebBeansConfigurationException e)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java Sat Nov  7 09:52:57 2009
@@ -57,7 +57,7 @@
     public void testComponentWithNonScopeStero()
     {
         clear();
-        defineSimpleWebBean(ComponentWithNonScopeStero.class);
+        defineManagedBean(ComponentWithNonScopeStero.class);
         Bean<?> bean = getComponents().get(0);
 
         Assert.assertEquals(Dependent.class, bean.getScope());
@@ -67,7 +67,7 @@
     public void testComponentDefaultScopeWithNonScopeStero()
     {
         clear();
-        defineSimpleWebBean(ComponentDefaultScopeWithNonScopeStero.class);
+        defineManagedBean(ComponentDefaultScopeWithNonScopeStero.class);
         Bean<?> bean = getComponents().get(0);
 
         Assert.assertEquals(SessionScoped.class, bean.getScope());
@@ -77,7 +77,7 @@
     public void testComponentWithDefaultScopeStero()
     {
         clear();
-        defineSimpleWebBean(ComponentWithDefaultScopeStero.class);
+        defineManagedBean(ComponentWithDefaultScopeStero.class);
         Bean<?> bean = getComponents().get(0);
 
         Assert.assertEquals(RequestScoped.class, bean.getScope());
@@ -89,7 +89,7 @@
         clear();
         try
         {
-            defineSimpleWebBean(ComponentWithDifferentScopeSteros.class);
+            defineManagedBean(ComponentWithDifferentScopeSteros.class);
         }
         catch (WebBeansConfigurationException e)
         {
@@ -103,7 +103,7 @@
     public void testComponentWithoutScopeStero()
     {
         clear();
-        defineSimpleWebBean(ComponentWithoutScopeStero.class);
+        defineManagedBean(ComponentWithoutScopeStero.class);
         Bean<?> bean = getComponents().get(0);
 
         Assert.assertEquals(Dependent.class, bean.getScope());
@@ -113,7 +113,7 @@
     public void testComponentWithSameScopeSteros()
     {
         clear();
-        defineSimpleWebBean(ComponentWithSameScopeSteros.class);
+        defineManagedBean(ComponentWithSameScopeSteros.class);
         Bean<?> bean = getComponents().get(0);
 
         Assert.assertEquals(SessionScoped.class, bean.getScope());
@@ -123,7 +123,7 @@
     public void testComponentDefaultScopeWithDifferentScopeSteros()
     {
         clear();
-        defineSimpleWebBean(ComponentDefaultScopeWithDifferentScopeSteros.class);
+        defineManagedBean(ComponentDefaultScopeWithDifferentScopeSteros.class);
         Bean<?> bean = getComponents().get(0);
 
         Assert.assertEquals(SessionScoped.class, bean.getScope());
@@ -135,7 +135,7 @@
         clear();
         try
         {
-            defineSimpleWebBean(ComponentNonDefaultScopeWithDifferentScopeSteros.class);
+            defineManagedBean(ComponentNonDefaultScopeWithDifferentScopeSteros.class);
         }
         catch (WebBeansConfigurationException e)
         {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/initializer/BrokenInitializerTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/initializer/BrokenInitializerTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/initializer/BrokenInitializerTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/initializer/BrokenInitializerTest.java Sat Nov  7 09:52:57 2009
@@ -45,7 +45,7 @@
         
         try
         {
-            defineSimpleWebBean(BrokenInitializer1.class);
+            defineManagedBean(BrokenInitializer1.class);
             
         }catch(Exception e1)
         {
@@ -63,7 +63,7 @@
         
         try
         {
-            defineSimpleWebBean(BrokenInitializer2.class);
+            defineManagedBean(BrokenInitializer2.class);
             
         }catch(Exception e1)
         {
@@ -81,7 +81,7 @@
         
         try
         {
-            defineSimpleWebBean(BrokenInitializer3.class);
+            defineManagedBean(BrokenInitializer3.class);
             
         }catch(Exception e1)
         {
@@ -99,7 +99,7 @@
         
         try
         {
-            defineSimpleWebBean(BrokenInitializer4.class);
+            defineManagedBean(BrokenInitializer4.class);
             
         }catch(Exception e1)
         {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java Sat Nov  7 09:52:57 2009
@@ -51,7 +51,7 @@
     @Test
     public void testInheritedComponentMetaData()
     {
-        AbstractBean<InheritFromParentComponent> component = defineSimpleWebBean(InheritFromParentComponent.class);
+        AbstractBean<InheritFromParentComponent> component = defineManagedBean(InheritFromParentComponent.class);
         
         BeanInheritedMetaData<InheritFromParentComponent> data = new BeanInheritedMetaData<InheritFromParentComponent>(component);
         

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedInstanceComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedInstanceComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedInstanceComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedInstanceComponentTest.java Sat Nov  7 09:52:57 2009
@@ -48,11 +48,11 @@
         getManager().addBean(WebBeansUtil.getInstanceBean());
         
         ContextFactory.initRequestContext(null);
-        Bean<PaymentProcessorComponent> bean =  defineSimpleWebBean(PaymentProcessorComponent.class);
+        Bean<PaymentProcessorComponent> bean =  defineManagedBean(PaymentProcessorComponent.class);
         
         getManager().getInstance(bean);
         
-        Bean<InstanceInjectedComponent> injectedBean = defineSimpleWebBean(InstanceInjectedComponent.class);
+        Bean<InstanceInjectedComponent> injectedBean = defineManagedBean(InstanceInjectedComponent.class);
                 
         InstanceInjectedComponent instance = getManager().getInstance(injectedBean);
         

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java Sat Nov  7 09:52:57 2009
@@ -48,10 +48,10 @@
         WebBeansXMLConfigurator configurator = new WebBeansXMLConfigurator();
         configurator.configureSpecSpecific(stream, "alternative.xml");
         
-        defineSimpleWebBean(AlternativeComponent.class);
-        defineSimpleWebBean(NotAlternativeComponent.class);
+        defineManagedBean(AlternativeComponent.class);
+        defineManagedBean(NotAlternativeComponent.class);
         
-        Bean<AlternativeInjector> injector = defineSimpleWebBean(AlternativeInjector.class);
+        Bean<AlternativeInjector> injector = defineManagedBean(AlternativeInjector.class);
         AlternativeInjector instance = (AlternativeInjector) getManager().getReference(injector, AlternativeInjector.class, getManager().createCreationalContext(injector));
         
         Assert.assertNotNull(instance);
@@ -71,10 +71,10 @@
         
         AlternativesManager.getInstance().clear();
         
-        defineSimpleWebBean(AlternativeComponent.class);
-        defineSimpleWebBean(NotAlternativeComponent.class);
+        defineManagedBean(AlternativeComponent.class);
+        defineManagedBean(NotAlternativeComponent.class);
         
-        Bean<AlternativeInjector> injector = defineSimpleWebBean(AlternativeInjector.class);
+        Bean<AlternativeInjector> injector = defineManagedBean(AlternativeInjector.class);
         AlternativeInjector instance = (AlternativeInjector) getManager().getReference(injector, AlternativeInjector.class, getManager().createCreationalContext(injector));
         
         Assert.assertNotNull(instance);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/broken/InjectedInstanceBrokenComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/broken/InjectedInstanceBrokenComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/broken/InjectedInstanceBrokenComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/broken/InjectedInstanceBrokenComponentTest.java Sat Nov  7 09:52:57 2009
@@ -46,7 +46,7 @@
         
         try
         {
-            defineSimpleWebBean(InstanceInjectedBrokenComponent1.class);
+            defineManagedBean(InstanceInjectedBrokenComponent1.class);
             
         }catch(Exception e1)
         {
@@ -64,7 +64,7 @@
         
         try
         {
-            defineSimpleWebBean(InstanceInjectedBrokenComponent2.class);
+            defineManagedBean(InstanceInjectedBrokenComponent2.class);
             
         }catch(Exception e1)
         {
@@ -72,7 +72,7 @@
             System.out.println(e.getMessage());
         }
         
-        Assert.assertNotNull(e);
+        Assert.assertNull(e);
     }
 
     @Test
@@ -82,7 +82,7 @@
         
         try
         {
-            defineSimpleWebBean(InstanceInjectedBrokenComponent3.class);
+            defineManagedBean(InstanceInjectedBrokenComponent3.class);
             
         }catch(Exception e1)
         {
@@ -100,7 +100,7 @@
         
         try
         {
-            defineSimpleWebBean(InstanceInjectedBrokenComponent4.class);
+            defineManagedBean(InstanceInjectedBrokenComponent4.class);
             
         }
         catch(Exception e1)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java Sat Nov  7 09:52:57 2009
@@ -38,8 +38,8 @@
     @SuppressWarnings("unchecked")
     public void testGenericBeanInjection()
     {
-        defineSimpleWebBean(GenericComponent.class);
-        AbstractBean<GenericComponentInjector> bean2 = defineSimpleWebBean(GenericComponentInjector.class);
+        defineManagedBean(GenericComponent.class);
+        AbstractBean<GenericComponentInjector> bean2 = defineManagedBean(GenericComponentInjector.class);
         
         GenericComponentInjector<?> instance = getManager().getInstance(bean2);
         Assert.assertNotNull(instance.getInjection1());

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java Sat Nov  7 09:52:57 2009
@@ -52,7 +52,7 @@
     @Test
     public void testFieldWithNamedValue() throws Exception
     {
-        Bean<NamedFieldWithNamedValue> bean = defineSimpleWebBean(NamedFieldWithNamedValue.class);
+        Bean<NamedFieldWithNamedValue> bean = defineManagedBean(NamedFieldWithNamedValue.class);
         Field field = NamedFieldWithNamedValue.class.getDeclaredField("paymentProcessor");
         
         InjectionPoint point =InjectionPointFactory.getFieldInjectionPointData(bean, field);
@@ -67,7 +67,7 @@
     @Test
     public void testFieldWithoutNamedValue() throws Exception
     {
-        Bean<NamedFieldWithoutNamedValue> bean = defineSimpleWebBean(NamedFieldWithoutNamedValue.class);
+        Bean<NamedFieldWithoutNamedValue> bean = defineManagedBean(NamedFieldWithoutNamedValue.class);
         Field field = NamedFieldWithoutNamedValue.class.getDeclaredField("paymentProcessor");
         
         InjectionPoint point =InjectionPointFactory.getFieldInjectionPointData(bean, field);
@@ -83,7 +83,7 @@
     @Test
     public void testOtherWithNamedValue() throws Exception
     {
-        Bean<NamedOtherWithNamedValue> bean = defineSimpleWebBean(NamedOtherWithNamedValue.class);
+        Bean<NamedOtherWithNamedValue> bean = defineManagedBean(NamedOtherWithNamedValue.class);
         Constructor<?> constructor = NamedOtherWithNamedValue.class.getDeclaredConstructor(new Class<?>[]{IPayment.class});
         
         InjectionPoint point =InjectionPointFactory.getConstructorInjectionPointData(bean, constructor).get(0);
@@ -99,7 +99,7 @@
     @Test(expected=WebBeansConfigurationException.class)
     public void testOtherWithoutNamedValue() throws Exception
     {
-        Bean<NamedOtherWithoutNamedValue> bean = defineSimpleWebBean(NamedOtherWithoutNamedValue.class);
+        Bean<NamedOtherWithoutNamedValue> bean = defineManagedBean(NamedOtherWithoutNamedValue.class);
         Constructor<?> constructor = NamedOtherWithoutNamedValue.class.getDeclaredConstructor(new Class<?>[]{IPayment.class});
         
         InjectionPoint point =InjectionPointFactory.getConstructorInjectionPointData(bean, constructor).get(0);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java Sat Nov  7 09:52:57 2009
@@ -52,14 +52,14 @@
     @Test
     public void testInterceptedComponent()
     {
-        defineSimpleWebBean(InterceptedComponent.class);
+        defineManagedBean(InterceptedComponent.class);
     }
 
     @Test
     public void testInterceptorCalls()
     {
         clear();
-        defineSimpleWebBean(InterceptedComponent.class);
+        defineManagedBean(InterceptedComponent.class);
 
         ContextFactory.initRequestContext(null);
         List<AbstractBean<?>> comps = getComponents();
@@ -80,7 +80,7 @@
     public void testMultipleInterceptedComponent()
     {
         clear();
-        defineSimpleWebBean(MultipleInterceptedComponent.class);
+        defineManagedBean(MultipleInterceptedComponent.class);
 
         ContextFactory.initRequestContext(null);
         List<AbstractBean<?>> comps = getComponents();
@@ -105,7 +105,7 @@
     public void testInterceptorWithSuperClassComponent()
     {
         clear();
-        defineSimpleWebBean(InterceptorWithSuperClassInterceptedComponent.class);
+        defineManagedBean(InterceptorWithSuperClassInterceptedComponent.class);
 
         ContextFactory.initRequestContext(null);
         List<AbstractBean<?>> comps = getComponents();
@@ -130,7 +130,7 @@
     public void testMultipleListOfInterceptedComponent()
     {
         clear();
-        defineSimpleWebBean(MultipleListOfInterceptedComponent.class);
+        defineManagedBean(MultipleListOfInterceptedComponent.class);
 
         ContextFactory.initRequestContext(null);
         List<AbstractBean<?>> comps = getComponents();
@@ -153,7 +153,7 @@
     public void testMultipleListOfInterceptedWithExcludeClassComponent()
     {
         clear();
-        defineSimpleWebBean(MultipleListOfInterceptedWithExcludeClassComponent.class);
+        defineManagedBean(MultipleListOfInterceptedWithExcludeClassComponent.class);
 
         ContextFactory.initRequestContext(null);
         List<AbstractBean<?>> comps = getComponents();

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java Sat Nov  7 09:52:57 2009
@@ -42,7 +42,7 @@
     {
         try
         {
-            AbstractBean<MultpleInterceptor> component = defineSimpleWebBean(MultpleInterceptor.class);
+            AbstractBean<MultpleInterceptor> component = defineManagedBean(MultpleInterceptor.class);
 
             EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
         }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java Sat Nov  7 09:52:57 2009
@@ -47,8 +47,8 @@
     {
         clear();
 
-        defineSimpleWebBean(CheckWithCheckPayment.class);
-        defineSimpleWebBean(PostConstructDoubleInterceptorComponent.class);
+        defineManagedBean(CheckWithCheckPayment.class);
+        defineManagedBean(PostConstructDoubleInterceptorComponent.class);
         List<AbstractBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java Sat Nov  7 09:52:57 2009
@@ -46,8 +46,8 @@
     {
         clear();
 
-        defineSimpleWebBean(CheckWithCheckPayment.class);
-        defineSimpleWebBean(PostConstructInterceptorComponent.class);
+        defineManagedBean(CheckWithCheckPayment.class);
+        defineManagedBean(PostConstructInterceptorComponent.class);
         List<AbstractBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/CallingBusinessInConstructorTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/CallingBusinessInConstructorTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/CallingBusinessInConstructorTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/CallingBusinessInConstructorTest.java Sat Nov  7 09:52:57 2009
@@ -57,7 +57,7 @@
         clear();        
         
         defineSimpleWebBeanInterceptor(SecureInterceptor.class);
-        Bean<CallBusinessInConstructorBean> bean = defineSimpleWebBean(CallBusinessInConstructorBean.class);
+        Bean<CallBusinessInConstructorBean> bean = defineManagedBean(CallBusinessInConstructorBean.class);
         CallBusinessInConstructorBean instance = (CallBusinessInConstructorBean) getInstanceByName("callBusinessInConstructorBean");
         
         Assert.assertNotNull(instance);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java Sat Nov  7 09:52:57 2009
@@ -49,7 +49,7 @@
         ContextFactory.initSessionContext(new MockHttpSession());
         defineSimpleWebBeanInterceptor(SecureAndTransactionalInterceptor.class);
         
-        Bean<SecureAndTransactionalComponent> bean = defineSimpleWebBean(SecureAndTransactionalComponent.class);
+        Bean<SecureAndTransactionalComponent> bean = defineManagedBean(SecureAndTransactionalComponent.class);
         SecureAndTransactionalComponent payment = getManager().getInstance(bean);
         
         Assert.assertFalse(SecureAndTransactionalComponent.getCALL());

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureInterceptorComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureInterceptorComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureInterceptorComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureInterceptorComponentTest.java Sat Nov  7 09:52:57 2009
@@ -42,7 +42,7 @@
     public void testSecureInterceptor()
     {
         defineSimpleWebBeanInterceptor(SecureInterceptor.class);
-        AbstractBean<SecureComponent> component = defineSimpleWebBean(SecureComponent.class);
+        AbstractBean<SecureComponent> component = defineManagedBean(SecureComponent.class);
 
         ContextFactory.initRequestContext(null);
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java Sat Nov  7 09:52:57 2009
@@ -52,7 +52,7 @@
         ContextFactory.initSessionContext(new MockHttpSession());
         defineSimpleWebBeanInterceptor(TransactionalInterceptor.class);
         
-        Bean<ShoppingCard> bean = defineSimpleWebBean(ShoppingCard.class);
+        Bean<ShoppingCard> bean = defineManagedBean(ShoppingCard.class);
         ShoppingCard card = getManager().getInstance(bean);
         
         card.placeOrder();

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java Sat Nov  7 09:52:57 2009
@@ -63,7 +63,7 @@
         try
         {
             defineSimpleWebBeanInterceptor(WebBeansInterceptor.class);
-            defineSimpleWebBean(WInterceptorComponent.class);
+            defineManagedBean(WInterceptorComponent.class);
 
         }
         catch (WebBeansConfigurationException e)
@@ -82,7 +82,7 @@
         getComponents().clear();
 
         defineSimpleWebBeanInterceptor(WebBeansInterceptor.class);
-        defineSimpleWebBean(WInterceptorComponent.class);
+        defineManagedBean(WInterceptorComponent.class);
 
         ContextFactory.initRequestContext(null);
         List<AbstractBean<?>> comps = getComponents();
@@ -106,7 +106,7 @@
 
         defineSimpleWebBeanInterceptor(WebBeansInterceptor.class);
         defineSimpleWebBeanInterceptor(WebBeanswithMetaInterceptor.class);
-        defineSimpleWebBean(WMetaInterceptorComponent.class);
+        defineManagedBean(WMetaInterceptorComponent.class);
 
         ContextFactory.initRequestContext(null);
         List<AbstractBean<?>> comps = getComponents();

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/library/LibraryComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/library/LibraryComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/library/LibraryComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/library/LibraryComponentTest.java Sat Nov  7 09:52:57 2009
@@ -44,7 +44,7 @@
     {
         clear();
 
-        defineSimpleWebBean(BookShop.class);
+        defineManagedBean(BookShop.class);
         List<AbstractBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/newcomp/NewComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/newcomp/NewComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/newcomp/NewComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/newcomp/NewComponentTest.java Sat Nov  7 09:52:57 2009
@@ -48,9 +48,9 @@
     {
         clear();
 
-        defineSimpleWebBean(DependentComponent.class);
-        defineSimpleWebBean(DependentOwnerComponent.class);
-        defineSimpleWebBean(NewComponent.class);
+        defineManagedBean(DependentComponent.class);
+        defineManagedBean(DependentOwnerComponent.class);
+        defineManagedBean(NewComponent.class);
 
         ContextFactory.initRequestContext(null);
 
@@ -71,8 +71,8 @@
     public void testDepedent2()
     {
         clear();
-        defineSimpleWebBean(CheckWithCheckPayment.class);
-        defineSimpleWebBean(ProducerNewComponent.class);
+        defineManagedBean(CheckWithCheckPayment.class);
+        defineManagedBean(ProducerNewComponent.class);
 
         ContextFactory.initRequestContext(null);
         Assert.assertEquals(5, getDeployedComponents());

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/pfield/ProducerFieldComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/pfield/ProducerFieldComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/pfield/ProducerFieldComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/pfield/ProducerFieldComponentTest.java Sat Nov  7 09:52:57 2009
@@ -48,16 +48,16 @@
     {
         ContextFactory.initRequestContext(null);
         
-        defineSimpleWebBean(CheckWithCheckPayment.class);
-        defineSimpleWebBean(CheckWithMoneyPayment.class);
+        defineManagedBean(CheckWithCheckPayment.class);
+        defineManagedBean(CheckWithMoneyPayment.class);
         
-        Bean<PaymentProcessorComponent> pc = defineSimpleWebBean(PaymentProcessorComponent.class);
+        Bean<PaymentProcessorComponent> pc = defineManagedBean(PaymentProcessorComponent.class);
         Object obj = getManager().getInstance(pc);
         
         Assert.assertTrue(obj instanceof PaymentProcessorComponent);
         
-        Bean<ProducerFieldDefinitionComponent> beanDefine = defineSimpleWebBean(ProducerFieldDefinitionComponent.class);
-        Bean<ProducerFieldInjectedComponent> beanInjected = defineSimpleWebBean(ProducerFieldInjectedComponent.class);
+        Bean<ProducerFieldDefinitionComponent> beanDefine = defineManagedBean(ProducerFieldDefinitionComponent.class);
+        Bean<ProducerFieldInjectedComponent> beanInjected = defineManagedBean(ProducerFieldInjectedComponent.class);
         
         ProducerFieldDefinitionComponent defineComponentInstance = getManager().getInstance(beanDefine);
         

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java Sat Nov  7 09:52:57 2009
@@ -65,7 +65,7 @@
         
         System.out.println(ext.toString());
         
-        defineSimpleWebBean(BookShop.class);
+        defineManagedBean(BookShop.class);
         
         Assert.assertNotNull(MyExtension.processAnnotatedTypeEvent);
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/StaticProducerTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/StaticProducerTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/StaticProducerTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/StaticProducerTest.java Sat Nov  7 09:52:57 2009
@@ -44,7 +44,7 @@
 
         ContextFactory.initRequestContext(null);
 
-        defineSimpleWebBean(StaticProducer1.class);
+        defineManagedBean(StaticProducer1.class);
 
         ProducerMethodBean<?> pc = (ProducerMethodBean<?>) getManager().resolveByName("weight").iterator().next();
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/broken/BrokenProducerTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/broken/BrokenProducerTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/broken/BrokenProducerTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/broken/BrokenProducerTest.java Sat Nov  7 09:52:57 2009
@@ -44,7 +44,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(BrokenProducerComponent1.class);
+            defineManagedBean(BrokenProducerComponent1.class);
         }
         catch (Exception e)
         {
@@ -60,7 +60,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(BrokenProducerComponent2.class);
+            defineManagedBean(BrokenProducerComponent2.class);
         }
         catch (Exception e)
         {
@@ -76,7 +76,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(BrokenProducerComponent3.class);
+            defineManagedBean(BrokenProducerComponent3.class);
         }
         catch (Exception e)
         {
@@ -92,7 +92,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(BrokenProducerComponent4.class);
+            defineManagedBean(BrokenProducerComponent4.class);
         }
         catch (Exception e)
         {
@@ -108,7 +108,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(BrokenProducerComponent5.class);
+            defineManagedBean(BrokenProducerComponent5.class);
         }
         catch (Exception e)
         {
@@ -124,7 +124,7 @@
         try
         {
             clear();
-            defineSimpleWebBean(BrokenProducerComponent6.class);
+            defineManagedBean(BrokenProducerComponent6.class);
         }
         catch (Exception e)
         {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/primitive/PrimitiveProducerTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/primitive/PrimitiveProducerTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/primitive/PrimitiveProducerTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/primitive/PrimitiveProducerTest.java Sat Nov  7 09:52:57 2009
@@ -44,8 +44,8 @@
     {
         ContextFactory.initRequestContext(null);
         
-        defineSimpleWebBean(PrimitiveProducer.class);
-        defineSimpleWebBean(PrimitiveConsumer.class);
+        defineManagedBean(PrimitiveProducer.class);
+        defineManagedBean(PrimitiveConsumer.class);
         
         PrimitiveConsumer consumer = (PrimitiveConsumer) getManager().getInstanceByName("primitiveConsumer");
         

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/specializes/SpecializesProducer1Test.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/specializes/SpecializesProducer1Test.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/specializes/SpecializesProducer1Test.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/specializes/SpecializesProducer1Test.java Sat Nov  7 09:52:57 2009
@@ -15,7 +15,7 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.annotation.binding.Binding2;
@@ -50,8 +50,8 @@
     {
         clear();
 
-        defineSimpleWebBean(SpecializesProducer1SuperClazz.class);
-        defineSimpleWebBean(SpecializesProducer1.class);
+        defineManagedBean(SpecializesProducer1SuperClazz.class);
+        defineManagedBean(SpecializesProducer1.class);
 
         Annotation binding1 = new AnnotationLiteral<Binding1>()
         {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/SpecializationComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/SpecializationComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/SpecializationComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/SpecializationComponentTest.java Sat Nov  7 09:52:57 2009
@@ -50,9 +50,9 @@
         
         ContextFactory.initRequestContext(null);
         
-        Bean<MockSpecializesService> bean1 = defineSimpleWebBean(MockSpecializesService.class);
-        Bean<AsynhrounousSpecalizesService> bean2 = defineSimpleWebBean(AsynhrounousSpecalizesService.class);
-        Bean<SpecializesServiceInjectorComponent> bean3 = defineSimpleWebBean(SpecializesServiceInjectorComponent.class);
+        Bean<MockSpecializesService> bean1 = defineManagedBean(MockSpecializesService.class);
+        Bean<AsynhrounousSpecalizesService> bean2 = defineManagedBean(AsynhrounousSpecalizesService.class);
+        Bean<SpecializesServiceInjectorComponent> bean3 = defineManagedBean(SpecializesServiceInjectorComponent.class);
         
         WebBeansUtil.configureSpecializations(MockSpecializesService.class);
         

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java Sat Nov  7 09:52:57 2009
@@ -52,10 +52,10 @@
         WebBeansXMLConfigurator configurator = new WebBeansXMLConfigurator();
         configurator.configureSpecSpecific(stream, "alternative.xml");
         
-        defineSimpleWebBean(SystemLogger.class);
-        defineSimpleWebBean(MockNotSpecializedLogger.class);        
+        defineManagedBean(SystemLogger.class);
+        defineManagedBean(MockNotSpecializedLogger.class);        
         
-        Bean<SpecializedInjector> bean = defineSimpleWebBean(SpecializedInjector.class);
+        Bean<SpecializedInjector> bean = defineManagedBean(SpecializedInjector.class);
         Object instance = getManager().getReference(bean, SpecializedInjector.class, null);
         
         Assert.assertTrue(instance instanceof SpecializedInjector);
@@ -88,12 +88,12 @@
         WebBeansXMLConfigurator configurator = new WebBeansXMLConfigurator();
         configurator.configureSpecSpecific(stream, "alternatives.xml");
         
-        defineSimpleWebBean(SystemLogger.class);
-        defineSimpleWebBean(MockSpecializedLogger.class);
+        defineManagedBean(SystemLogger.class);
+        defineManagedBean(MockSpecializedLogger.class);
         
         WebBeansUtil.configureSpecializations(MockSpecializedLogger.class);
         
-        Bean<SpecializedInjector> bean = defineSimpleWebBean(SpecializedInjector.class);
+        Bean<SpecializedInjector> bean = defineManagedBean(SpecializedInjector.class);
         Object instance = getManager().getReference(bean, SpecializedInjector.class, null);
         
         Assert.assertTrue(instance instanceof SpecializedInjector);

Added: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypeLiteralTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypeLiteralTest.java?rev=833663&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypeLiteralTest.java (added)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypeLiteralTest.java Sat Nov  7 09:52:57 2009
@@ -0,0 +1,90 @@
+/*
+ * 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 org.apache.webbeans.test.unittests.typedliteral;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.TypeLiteral;
+
+import junit.framework.Assert;
+
+import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.test.component.literals.InstanceTypeLiteralBean;
+import org.apache.webbeans.test.component.literals.InstanceTypeLiteralBean.IOrder;
+import org.apache.webbeans.test.component.literals.InstanceTypeLiteralBean.IntegerOrder;
+import org.apache.webbeans.test.component.literals.InstanceTypeLiteralBean.StringOrder;
+import org.apache.webbeans.test.servlet.TestContext;
+import org.apache.webbeans.util.WebBeansUtil;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TypeLiteralTest extends TestContext
+{
+    public TypeLiteralTest()
+    {
+        super(TypeLiteralTest.class.getName());
+    }
+    
+    @Before
+    public void init()
+    {
+        super.init();
+    }
+
+    public static class Literal1 extends TypeLiteral<Map<String, String>>
+    {
+        
+    }
+    
+    public TypeLiteral<List<Integer>> literal2 = new TypeLiteral<List<Integer>>(){};
+    
+    @Test
+    public void testLiterals()
+    {
+        Literal1 literal1 = new Literal1();
+        literal1.getRawType().equals(Map.class);
+        
+        literal2.getRawType().equals(List.class);
+    }
+    
+    @Test
+    public void testTypeLiteralInInstance()
+    {
+        clear();
+        
+        BeanManagerImpl.getManager().addBean(WebBeansUtil.getInstanceBean());
+        
+        defineManagedBean(StringOrder.class);
+        defineManagedBean(IntegerOrder.class);
+        Bean<InstanceTypeLiteralBean> bean =  defineManagedBean(InstanceTypeLiteralBean.class);
+        
+        Object object = getManager().getReference(bean, InstanceTypeLiteralBean.class,null );        
+        Assert.assertTrue(object instanceof InstanceTypeLiteralBean);
+        InstanceTypeLiteralBean beaninstance = (InstanceTypeLiteralBean)object;
+        Object produce = beaninstance.produce(0);
+        Assert.assertTrue(produce instanceof Instance);
+        
+        Instance<IntegerOrder> order = (Instance<IntegerOrder>)produce;
+        Assert.assertTrue(order.get() instanceof IntegerOrder);
+        
+        produce = beaninstance.produce(1);
+        Assert.assertTrue(produce instanceof Instance);
+
+        Instance<StringOrder> order2 = (Instance<StringOrder>)produce;
+        Assert.assertTrue(order.get() instanceof StringOrder);
+    }
+}

Propchange: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypeLiteralTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java Sat Nov  7 09:52:57 2009
@@ -16,10 +16,10 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Default;
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
 
 import junit.framework.Assert;
 
@@ -51,8 +51,8 @@
     {
         clear();
 
-        defineSimpleWebBean(TypeLiteralComponent.class);
-        defineSimpleWebBean(InjectedTypeLiteralComponent.class);
+        defineManagedBean(TypeLiteralComponent.class);
+        defineManagedBean(InjectedTypeLiteralComponent.class);
         List<AbstractBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
@@ -75,7 +75,7 @@
     {
         clear();
 
-        defineSimpleWebBean(TypeLiteralComponent.class);
+        defineManagedBean(TypeLiteralComponent.class);
         List<AbstractBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java Sat Nov  7 09:52:57 2009
@@ -38,8 +38,8 @@
     @Test
     public void testAlternativeCorrect()
     {
-        Bean<Alternative1> alternative1 = defineSimpleWebBean(Alternative1.class);
-        Bean<Alternative2> alternative2 = defineSimpleWebBean(Alternative2.class);        
+        Bean<Alternative1> alternative1 = defineManagedBean(Alternative1.class);
+        Bean<Alternative2> alternative2 = defineManagedBean(Alternative2.class);        
         
         InputStream stream = XMLTest.class.getClassLoader().getResourceAsStream("org/apache/webbeans/test/xml/strict/alternatives_correct.xml");
         Assert.assertNotNull(stream);



Mime
View raw message