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/12/19 01:03:09 UTC
svn commit: r1423723 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java
Author: rmannibucau
Date: Wed Dec 19 00:03:08 2012
New Revision: 1423723
URL: http://svn.apache.org/viewvc?rev=1423723&view=rev
Log:
forcing some standalonewebmodule for tests
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.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=1423723&r1=1423722&r2=1423723&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 Wed Dec 19 00:03:08 2012
@@ -322,7 +322,8 @@ public class ApplicationComposer extends
int webModulesNb = 0;
// Invoke the @Module producer methods to build out the AppModule
- for (FrameworkMethod method : testClass.getAnnotatedMethods(Module.class)) {
+ final List<FrameworkMethod> moduleMethods = testClass.getAnnotatedMethods(Module.class);
+ for (FrameworkMethod method : moduleMethods) {
final Object obj = method.invokeExplosively(testInstance);
final Classes classesAnnotation = method.getAnnotation(Classes.class);
@@ -488,6 +489,10 @@ public class ApplicationComposer extends
SystemInstance.get().setComponent(WebAppBuilder.class, new LightweightWebAppBuilder());
}
+ if (moduleMethods.size() == 1 && webModulesNb == 1) {
+ appModule.setStandloneWebModule();
+ }
+
try {
ConfigurationFactory config = new ConfigurationFactory();
config.init(SystemInstance.get().getProperties());
Modified: openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java?rev=1423723&r1=1423722&r2=1423723&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java Wed Dec 19 00:03:08 2012
@@ -111,6 +111,7 @@ public class RestDeploymentTest {
appModule.getWebModules().add(webModule);
appModule.getEjbModules().add(new EjbModule(ejbJar));
appModule.getEjbModules().iterator().next().setModuleId(webModule.getModuleId());
+ appModule.setStandloneWebModule();
annotationDeployer.deploy(appModule);
AppInfo appInfo = factory.configureApplication(appModule);