svn commit: r1004455 - /openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java

[db...@apache.org]

Author: dblevins
Date: Mon Oct  4 22:09:22 2010
New Revision: 1004455

URL: http://svn.apache.org/viewvc?rev=1004455&view=rev
Log:
Mark the ManagedBean as BMT

Modified:
    openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java

Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java?rev=1004455&r1=1004454&r2=1004455&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java Mon Oct  4 22:09:22 2010
@@ -34,7 +34,9 @@ import org.apache.openejb.jee.Connector;
 import org.apache.openejb.jee.EjbJar;
 import org.apache.openejb.jee.EnterpriseBean;
 import org.apache.openejb.jee.ManagedBean;
+import org.apache.openejb.jee.TransactionType;
 import org.apache.openejb.jee.jpa.unit.Persistence;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
 import org.apache.openejb.jee.oejb3.EjbDeployment;
 import org.apache.openejb.jee.oejb3.OpenejbJar;
 import org.apache.openejb.loader.SystemInstance;
@@ -83,7 +85,7 @@ public class ApplicationComposer extends
 
         int appModules = 0;
         int modules = 0;
-        Class[] moduleTypes = {EjbJar.class, EnterpriseBean.class, Persistence.class, Connector.class};
+        Class[] moduleTypes = {EjbJar.class, EnterpriseBean.class, Persistence.class, PersistenceUnit.class, Connector.class};
         for (FrameworkMethod method : testClass.getAnnotatedMethods(Module.class)) {
 
             modules++;
@@ -152,6 +154,7 @@ public class ApplicationComposer extends
                 final EjbJar ejbJar = new EjbJar();
                 final OpenejbJar openejbJar = new OpenejbJar();
                 final ManagedBean bean = ejbJar.addEnterpriseBean(new ManagedBean(javaClass));
+                bean.setTransactionType(TransactionType.BEAN);
 
                 final EjbDeployment ejbDeployment = openejbJar.addEjbDeployment(bean);
                 ejbDeployment.setDeploymentId(javaClass.getName());
@@ -188,6 +191,11 @@ public class ApplicationComposer extends
                     final Persistence persistence = (Persistence) obj;
                     appModule.getPersistenceModules().add(new PersistenceModule("", persistence));
 
+                } else if (obj instanceof PersistenceUnit) {
+
+                    final PersistenceUnit unit = (PersistenceUnit) obj;
+                    appModule.getPersistenceModules().add(new PersistenceModule("", new Persistence(unit)));
+
                 }
             }