[jboss-cvs] JBossAS SVN: r89655 - in projects/reloaded/trunk/injection/src: test/java/org/jboss/reloaded/injection/test/simple/unit and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2009-06-02 04:57:54 -0400 (Tue, 02 Jun 2009)
New Revision: 89655

Modified:
   projects/reloaded/trunk/injection/src/main/java/org/jboss/reloaded/injection/ManagedBeanFactoryBuilder.java
   projects/reloaded/trunk/injection/src/main/java/org/jboss/reloaded/injection/ManagedBeanInstance.java
   projects/reloaded/trunk/injection/src/test/java/org/jboss/reloaded/injection/test/simple/unit/SimpleResourceTestCase.java
Log:
RELOADED-8: minor cleanup

Modified: projects/reloaded/trunk/injection/src/main/java/org/jboss/reloaded/injection/ManagedBeanFactoryBuilder.java
===================================================================
--- projects/reloaded/trunk/injection/src/main/java/org/jboss/reloaded/injection/ManagedBeanFactoryBuilder.java	2009-06-02 07:55:22 UTC (rev 89654)
+++ projects/reloaded/trunk/injection/src/main/java/org/jboss/reloaded/injection/ManagedBeanFactoryBuilder.java	2009-06-02 08:57:54 UTC (rev 89655)
@@ -55,8 +55,10 @@
 import org.jboss.reloaded.injection.spi.Resolver;
 
 /**
- * Build BeanMetaData out of an injection Environment.
+ * Build BeanMetaData out of managed bean meta data.
  * 
+ * The builder must never refer to any runtime components.
+ * 
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
  * @version $Revision: $
  */
@@ -73,7 +75,7 @@
       
       BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, ManagedBeanFactory.class.getName());
       
-      ManagedBeanFactory<?> container = new ManagedBeanFactory(name, beanClass);
+      ManagedBeanFactory<?> container = instantiateContainer(name, beanClass);
       builder.setConstructorValue(container);
       
       RemoteEnvironment env = metaData.getEnvironment();
@@ -210,6 +212,11 @@
       }
    }
    
+   protected <T> ManagedBeanFactory<T> instantiateContainer(String name, Class<T> beanClass)
+   {
+      return new ManagedBeanFactory<T>(name, beanClass);
+   }
+   
    private static final boolean isEmpty(String s)
    {
       // can't use s.isEmpty, that's Java 6

Modified: projects/reloaded/trunk/injection/src/main/java/org/jboss/reloaded/injection/ManagedBeanInstance.java
===================================================================
--- projects/reloaded/trunk/injection/src/main/java/org/jboss/reloaded/injection/ManagedBeanInstance.java	2009-06-02 07:55:22 UTC (rev 89654)
+++ projects/reloaded/trunk/injection/src/main/java/org/jboss/reloaded/injection/ManagedBeanInstance.java	2009-06-02 08:57:54 UTC (rev 89655)
@@ -25,7 +25,7 @@
  * A managed bean instance consists of an instance of the bean class itself
  * and associated classes.
  * 
- * For example for EJB3 interceptor instances.
+ * For example for EJB3 the EJB and its interceptor instances.
  * 
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
  * @version $Revision: $

Modified: projects/reloaded/trunk/injection/src/test/java/org/jboss/reloaded/injection/test/simple/unit/SimpleResourceTestCase.java
===================================================================
--- projects/reloaded/trunk/injection/src/test/java/org/jboss/reloaded/injection/test/simple/unit/SimpleResourceTestCase.java	2009-06-02 07:55:22 UTC (rev 89654)
+++ projects/reloaded/trunk/injection/src/test/java/org/jboss/reloaded/injection/test/simple/unit/SimpleResourceTestCase.java	2009-06-02 08:57:54 UTC (rev 89655)
@@ -25,6 +25,7 @@
 
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.io.Reader;
 import java.lang.reflect.Method;
 
 import org.jboss.dependency.spi.ControllerState;
@@ -41,6 +42,8 @@
 import org.junit.Test;
 
 /**
+ * Test injection of simple environment entries (JavaEE 5.0 5.4)
+ * 
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
  * @version $Revision: $
  */
@@ -63,7 +66,7 @@
       unmarshaller.setSchemaValidation(false);
       unmarshaller.setValidation(false);
       ManagedBeanJarMetaData jar;
-      BufferedReader reader = new BufferedReader(new FileReader("src/test/resources/simple/jboss-mb.xml"));
+      Reader reader = new BufferedReader(new FileReader("src/test/resources/simple/jboss-mb.xml"));
       try
       {
          DefaultSchemaResolver resolver = new DefaultSchemaResolver();