openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r791061 [4/4] - in /incubator/openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/component/ main/java/org/apache/webbeans/component/third/ main/java/org/apache/webbeans/component/xml/ main/java/org/apache/webbeans/config/ m...
Date Sat, 04 Jul 2009 06:20:38 GMT
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=791061&r1=791060&r2=791061&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 Jul  4 06:20:35 2009
@@ -17,8 +17,8 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.ComponentImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.intercept.InterceptorData;
 import org.apache.webbeans.test.component.CheckWithCheckPayment;
@@ -49,7 +49,7 @@
 
         defineSimpleWebBean(CheckWithCheckPayment.class);
         defineSimpleWebBean(PostConstructDoubleInterceptorComponent.class);
-        List<AbstractComponent<?>> comps = getComponents();
+        List<AbstractBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 
@@ -63,7 +63,7 @@
 
         PostConstructDoubleInterceptorComponent pcc = (PostConstructDoubleInterceptorComponent)
object2;
 
-        ComponentImpl<PostConstructDoubleInterceptorComponent> s = (ComponentImpl<PostConstructDoubleInterceptorComponent>)
comps.get(1);
+        ManagedBean<PostConstructDoubleInterceptorComponent> s = (ManagedBean<PostConstructDoubleInterceptorComponent>)
comps.get(1);
 
         Assert.assertNotNull(pcc.getP());
 

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=791061&r1=791060&r2=791061&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 Jul  4 06:20:35 2009
@@ -17,8 +17,8 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.ComponentImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.intercept.InterceptorData;
 import org.apache.webbeans.test.component.CheckWithCheckPayment;
@@ -48,7 +48,7 @@
 
         defineSimpleWebBean(CheckWithCheckPayment.class);
         defineSimpleWebBean(PostConstructInterceptorComponent.class);
-        List<AbstractComponent<?>> comps = getComponents();
+        List<AbstractBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 
@@ -62,7 +62,7 @@
 
         PostConstructInterceptorComponent pcc = (PostConstructInterceptorComponent) object2;
 
-        ComponentImpl<PostConstructInterceptorComponent> s = (ComponentImpl<PostConstructInterceptorComponent>)
comps.get(1);
+        ManagedBean<PostConstructInterceptorComponent> s = (ManagedBean<PostConstructInterceptorComponent>)
comps.get(1);
 
         Assert.assertNotNull(pcc.getP());
 

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=791061&r1=791060&r2=791061&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 Jul  4 06:20:35 2009
@@ -15,7 +15,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.component.intercept.webbeans.SecureComponent;
 import org.apache.webbeans.test.component.intercept.webbeans.SecureInterceptor;
@@ -42,7 +42,7 @@
     public void testSecureInterceptor()
     {
         defineSimpleWebBeanInterceptor(SecureInterceptor.class);
-        AbstractComponent<SecureComponent> component = defineSimpleWebBean(SecureComponent.class);
+        AbstractBean<SecureComponent> component = defineSimpleWebBean(SecureComponent.class);
 
         ContextFactory.initRequestContext(null);
 

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=791061&r1=791060&r2=791061&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 Jul  4 06:20:35 2009
@@ -19,7 +19,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.test.component.intercept.webbeans.WInterceptorComponent;
@@ -85,7 +85,7 @@
         defineSimpleWebBean(WInterceptorComponent.class);
 
         ContextFactory.initRequestContext(null);
-        List<AbstractComponent<?>> comps = getComponents();
+        List<AbstractBean<?>> comps = getComponents();
 
         Object object = getManager().getInstance(comps.get(0));
 
@@ -109,7 +109,7 @@
         defineSimpleWebBean(WMetaInterceptorComponent.class);
 
         ContextFactory.initRequestContext(null);
-        List<AbstractComponent<?>> comps = getComponents();
+        List<AbstractBean<?>> comps = getComponents();
 
         Object object = getManager().getInstance(comps.get(0));
 

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=791061&r1=791060&r2=791061&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 Jul  4 06:20:35 2009
@@ -17,7 +17,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.component.library.Book;
 import org.apache.webbeans.test.component.library.BookShop;
@@ -45,13 +45,13 @@
         clear();
 
         defineSimpleWebBean(BookShop.class);
-        List<AbstractComponent<?>> comps = getComponents();
+        List<AbstractBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 
         Assert.assertEquals(1, comps.size());
 
-        AbstractComponent<?> obj = comps.get(0);
+        AbstractBean<?> obj = comps.get(0);
 
         Object instance = getManager().getInstance(obj);
         Assert.assertTrue(instance instanceof Shop);

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=791061&r1=791060&r2=791061&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 Jul  4 06:20:35 2009
@@ -17,7 +17,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.component.CheckWithCheckPayment;
 import org.apache.webbeans.test.component.IPayment;
@@ -54,7 +54,7 @@
 
         ContextFactory.initRequestContext(null);
 
-        List<AbstractComponent<?>> comps = getComponents();
+        List<AbstractBean<?>> comps = getComponents();
 
         Assert.assertEquals(3, comps.size());
 

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=791061&r1=791060&r2=791061&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 Jul  4 06:20:35 2009
@@ -15,7 +15,7 @@
 
 import java.lang.annotation.Annotation;
 
-import org.apache.webbeans.component.ProducerComponentImpl;
+import org.apache.webbeans.component.ProducerMethodBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.component.producer.StaticProducer1;
 import org.apache.webbeans.test.servlet.TestContext;
@@ -46,14 +46,14 @@
 
         defineSimpleWebBean(StaticProducer1.class);
 
-        ProducerComponentImpl<?> pc = (ProducerComponentImpl<?>) getManager().resolveByName("weight").iterator().next();
+        ProducerMethodBean<?> pc = (ProducerMethodBean<?>) getManager().resolveByName("weight").iterator().next();
 
         Object obj = getManager().getInstance(pc);
 
         Assert.assertTrue(obj instanceof Integer);
         Assert.assertEquals(79, obj);
 
-        pc = (ProducerComponentImpl<?>) getManager().resolveByType(int.class, new Annotation[]
{}).iterator().next();
+        pc = (ProducerMethodBean<?>) getManager().resolveByType(int.class, new Annotation[]
{}).iterator().next();
 
         obj = getManager().getInstance(pc);
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/resolution/ManagerResolutionTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/resolution/ManagerResolutionTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/resolution/ManagerResolutionTest.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/resolution/ManagerResolutionTest.java
Sat Jul  4 06:20:35 2009
@@ -17,7 +17,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.ManagerComponentImpl;
+import org.apache.webbeans.component.BeanManagerBean;
 import org.apache.webbeans.test.servlet.TestContext;
 import org.apache.webbeans.util.WebBeansUtil;
 import org.junit.Before;
@@ -40,7 +40,7 @@
     @Test
     public void testManagerResolution()
     {
-        ManagerComponentImpl component = WebBeansUtil.getManagerComponent();
+        BeanManagerBean component = WebBeansUtil.getManagerComponent();
         BeanManager manager = getManager().getInstance(component);
 
         Assert.assertNotNull(manager);

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=791061&r1=791060&r2=791061&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 Jul  4 06:20:35 2009
@@ -23,8 +23,8 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.component.ITypeLiteralComponent;
 import org.apache.webbeans.test.component.InjectedTypeLiteralComponent;
@@ -53,7 +53,7 @@
 
         defineSimpleWebBean(TypeLiteralComponent.class);
         defineSimpleWebBean(InjectedTypeLiteralComponent.class);
-        List<AbstractComponent<?>> comps = getComponents();
+        List<AbstractBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 
@@ -80,7 +80,7 @@
         clear();
 
         defineSimpleWebBean(TypeLiteralComponent.class);
-        List<AbstractComponent<?>> comps = getComponents();
+        List<AbstractBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 
@@ -96,7 +96,7 @@
 
         };
 
-        Bean<?> s = ManagerImpl.getManager().resolveByType(tl, anns).iterator().next();
+        Bean<?> s = BeanManagerImpl.getManager().resolveByType(tl, anns).iterator().next();
         Assert.assertNotNull(s);
 
         ContextFactory.destroyRequestContext(null);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java
Sat Jul  4 06:20:35 2009
@@ -20,7 +20,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.test.servlet.TestContext;
 import org.apache.webbeans.xml.XMLUtil;
 import org.dom4j.Element;
@@ -44,7 +44,7 @@
     @Before
     public void init()
     {
-        this.container = ManagerImpl.getManager();
+        this.container = BeanManagerImpl.getManager();
     }
 
     public void startTests(ServletContext ctx)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java
Sat Jul  4 06:20:35 2009
@@ -15,8 +15,8 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.xml.XMLComponentImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.xml.XMLManagedBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.context.creational.CreationalContextFactory;
 import org.apache.webbeans.test.annotation.binding.Mock;
@@ -52,7 +52,7 @@
     {
         clear();
 
-        XMLComponentImpl<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/definition1.xml");
+        XMLManagedBean<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/definition1.xml");
 
         Assert.assertEquals("definition1", compDef.getName());
 
@@ -67,7 +67,7 @@
     {
         clear();
 
-        XMLComponentImpl<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/definition2.xml");
+        XMLManagedBean<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/definition2.xml");
 
         Object instance = compDef.create(null);
 
@@ -108,7 +108,7 @@
     {
         clear();
 
-        XMLComponentImpl<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanUnnamed.xml");
+        XMLManagedBean<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanUnnamed.xml");
 
         // an unnamed bean must not have a name
         Assert.assertNull(compDef.getName());
@@ -142,7 +142,7 @@
 
         ContextFactory.initRequestContext(null);
 
-        AbstractComponent<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanConstructor2.xml",
TstBeanConstructor.class);
+        AbstractBean<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanConstructor2.xml",
TstBeanConstructor.class);
 
         Object instance = compDef.create(CreationalContextFactory.getInstance().getCreationalContext(compDef));
         Assert.assertNotNull(instance);



Mime
View raw message