You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/05 12:47:18 UTC
svn commit: r1240703 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
Author: rmannibucau
Date: Sun Feb 5 11:47:17 2012
New Revision: 1240703
URL: http://svn.apache.org/viewvc?rev=1240703&view=rev
Log:
OPENEJB-1763 allow WebModule to be provided.
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java?rev=1240703&r1=1240702&r2=1240703&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java Sun Feb 5 11:47:17 2012
@@ -27,6 +27,7 @@ import org.apache.openejb.config.Configu
import org.apache.openejb.config.ConnectorModule;
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.config.PersistenceModule;
+import org.apache.openejb.config.WebModule;
import org.apache.openejb.core.Operation;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.ivm.naming.InitContextFactory;
@@ -92,7 +93,7 @@ public class ApplicationComposer extends
int appModules = 0;
int modules = 0;
- Class[] moduleTypes = { EjbModule.class, EjbJar.class, EnterpriseBean.class, Persistence.class, PersistenceUnit.class, Connector.class, Beans.class, Application.class, Class[].class};
+ Class[] moduleTypes = { WebModule.class, EjbModule.class, EjbJar.class, EnterpriseBean.class, Persistence.class, PersistenceUnit.class, Connector.class, Beans.class, Application.class, Class[].class};
for (FrameworkMethod method : testClass.getAnnotatedMethods(Module.class)) {
modules++;
@@ -179,7 +180,9 @@ public class ApplicationComposer extends
final Object obj = method.invokeExplosively(testInstance);
- if (obj instanceof EjbModule) {
+ if (obj instanceof WebModule) {
+ appModule.getWebModules().add((WebModule) obj);
+ } else if (obj instanceof EjbModule) {
appModule.getEjbModules().add((EjbModule) obj);
} else if (obj instanceof EjbJar) {