You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/01/12 01:44:59 UTC
svn commit: r1057961 - in /geronimo/server/trunk/plugins: jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java

Author: djencks
Date: Wed Jan 12 00:44:58 2011
New Revision: 1057961

URL: http://svn.apache.org/viewvc?rev=1057961&view=rev
Log:
clean up owb before each test

Modified:
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java?rev=1057961&r1=1057960&r2=1057961&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java Wed Jan 12 00:44:58 2011
@@ -68,6 +68,8 @@ import org.apache.geronimo.transaction.m
 import org.apache.geronimo.web.WebAttributeName;
 import org.apache.geronimo.web.info.ServletInfo;
 import org.apache.geronimo.web.info.WebAppInfo;
+import org.apache.webbeans.config.WebBeansFinder;
+import org.apache.webbeans.spi.SingletonService;
 import org.eclipse.jetty.security.Authenticator;
 import org.eclipse.jetty.security.IdentityService;
 import org.eclipse.jetty.security.LoginService;
@@ -110,7 +112,7 @@ public class AbstractWebModuleTest exten
     }
 
     protected WebAppContextWrapper setUpAppContext(String securityRealmName, SecurityHandlerFactory securityHandlerFactory, String policyContextId, RunAsSource runAsSource, String uriString, WebAppInfo webAppInfo) throws Exception {
-
+        WebBeansFinder.clearInstances(getClass().getClassLoader());
         ApplicationPolicyConfigurationManager applicationPolicyConfigurationManager = null;
         //Setup default JSP Factory
         Class.forName("org.apache.jasper.compiler.JspRuntimeContext");

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=1057961&r1=1057960&r2=1057961&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Wed Jan 12 00:44:58 2011
@@ -62,6 +62,7 @@ import org.apache.geronimo.transaction.m
 import org.apache.geronimo.web.WebAttributeName;
 import org.apache.geronimo.web.info.ServletInfo;
 import org.apache.geronimo.web.info.WebAppInfo;
+import org.apache.webbeans.config.WebBeansFinder;
 import org.osgi.framework.Bundle;
 
 
@@ -92,6 +93,7 @@ public abstract class AbstractWebModuleT
     }
 
     protected TomcatWebAppContext setUpInsecureAppContext(String relativeWebAppRoot, URL configurationBaseURL, SecurityHolder securityHolder, RunAsSource runAsSource, ObjectRetriever tomcatRealm, ValveGBean valveChain, WebAppInfo webAppInfo) throws Exception {
+        WebBeansFinder.clearInstances(getClass().getClassLoader());
         configurationBaseURL = cl.getResource("deployables/");
         //Setup default JSP Factory
         Class.forName("org.apache.jasper.compiler.JspRuntimeContext");