Author: rmannibucau
Date: Mon Oct 29 09:58:17 2012
New Revision: 1403216
URL: http://svn.apache.org/viewvc?rev=1403216&view=rev
Log:
using ScopeHelper in ApplicationComposer too
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=1403216&r1=1403215&r2=1403216&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
Mon Oct 29 09:58:17 2012
@@ -24,6 +24,7 @@ import org.apache.openejb.OpenEJBRuntime
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.cdi.ScopeHelper;
import org.apache.openejb.config.AppModule;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.config.ConnectorModule;
@@ -52,6 +53,8 @@ import org.apache.openejb.util.Join;
import org.apache.openejb.util.ServiceManagerProxy;
import org.apache.webbeans.inject.AbstractInjectable;
import org.apache.webbeans.inject.OWBInjector;
+import org.apache.webbeans.web.lifecycle.test.MockHttpSession;
+import org.apache.webbeans.web.lifecycle.test.MockServletContext;
import org.apache.xbean.finder.AnnotationFinder;
import org.apache.xbean.finder.IAnnotationFinder;
import org.apache.xbean.finder.archive.Archive;
@@ -383,10 +386,15 @@ public class ApplicationComposer extends
}
}
+ final MockServletContext servletContext = new
MockServletContext();
+ final MockHttpSession session = new MockHttpSession();
+
final AppInfo appInfo = config.configureApplication(appModule);
final AppContext appContext =
assembler.createApplication(appInfo);
+
ScopeHelper.startContexts(appContext.getWebBeansContext().getContextsService(),
servletContext, session);
+
try {
final ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
final BeanContext context =
containerSystem.getBeanContext(javaClass.getName());
@@ -440,6 +448,7 @@ public class ApplicationComposer extends
}
} finally {
+
ScopeHelper.stopContexts(appContext.getWebBeansContext().getContextsService(),
servletContext, session);
assembler.destroyApplication(appInfo.path);
}
} finally {
