You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/03/21 12:59:37 UTC
svn commit: r1083747 - in
/myfaces/extensions/cdi/trunk/test-modules/owb10-support-module: pom.xml
src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java
Author: gpetracek
Date: Mon Mar 21 11:59:36 2011
New Revision: 1083747
URL: http://svn.apache.org/viewvc?rev=1083747&view=rev
Log:
EXTCDI-157 cleanup
Modified:
myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/pom.xml
myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java
Modified: myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/pom.xml?rev=1083747&r1=1083746&r2=1083747&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/pom.xml Mon Mar 21 11:59:36 2011
@@ -56,24 +56,18 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <!-- owb 1.1+ isn't compatible with the used owb-support module -> explicit version required -->
- <version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans.test</groupId>
<artifactId>cditest</artifactId>
- <!-- owb 1.1+ isn't compatible with the used owb-support module -> explicit version required -->
- <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans.test</groupId>
<artifactId>cditest-owb</artifactId>
- <!-- owb 1.1+ isn't compatible with the used owb-support module -> explicit version required -->
- <version>1.0.0</version>
<scope>provided</scope>
</dependency>
Modified: myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java?rev=1083747&r1=1083746&r2=1083747&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java Mon Mar 21 11:59:36 2011
@@ -20,10 +20,6 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.test.spi.WebAppAwareCdiTestContainer;
import org.apache.webbeans.cditest.CdiTestContainerLoader;
-import org.apache.webbeans.context.ContextFactory;
-
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
/**
* @author Gerhard Petracek
@@ -38,21 +34,65 @@ public class ServletOpenWebBeans10TestCo
public void beginSession()
{
- ContextFactory.activateContext(SessionScoped.class);
+ try
+ {
+ this.testContainer.startSessionScope();
+ }
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
}
public void beginRequest()
{
- ContextFactory.activateContext(RequestScoped.class);
+ try
+ {
+ this.testContainer.startRequestScope();
+ }
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
}
public void endRequest()
{
- ContextFactory.deActivateContext(RequestScoped.class);
+ try
+ {
+ this.testContainer.stopRequestScope();
+ }
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
}
public void endSession()
{
- ContextFactory.deActivateContext(SessionScoped.class);
+ try
+ {
+ this.testContainer.stopSessionScope();
+ }
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
}
}