Disable this for now as it produces more side effects on Form authentication
diff --git a/src/test/tomcat/conf/context.xml b/src/test/tomcat/conf/context.xml
index 18a9e49..0be9958 100644
--- a/src/test/tomcat/conf/context.xml
+++ b/src/test/tomcat/conf/context.xml
@@ -16,20 +16,26 @@
limitations under the License.
-->
<!-- The contents of this file will be loaded for each web application -->
-<Context crossContext="true" resourceOnlyServlets="jsp">
- <CookieProcessor className="org.apache.tomcat.util.http.LegacyCookieProcessor" alwaysAddExpires="true" forwardSlashIsSeparator="false" />
- <!-- Default set of monitored resources. If one of these changes, the -->
- <!-- web application will be reloaded. -->
- <WatchedResource>WEB-INF/web.xml</WatchedResource>
- <WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
- <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
+<Context crossContext="true" resourceOnlyServlets="jsp" jndiExceptionOnFailedWrite="false">
+ <CookieProcessor className="org.apache.tomcat.util.http.LegacyCookieProcessor" alwaysAddExpires="true" forwardSlashIsSeparator="false" />
+ <!-- Default set of monitored resources. If one of these changes, the -->
+ <!-- web application will be reloaded. -->
+ <WatchedResource>WEB-INF/web.xml</WatchedResource>
+ <WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
+ <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
- <!-- Uncomment this to disable session persistence across Tomcat restarts -->
- <!--
- <Manager pathname="" />
- -->
+ <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+ <!--
+ <Manager pathname="" />
+ -->
- <Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
- jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"
- />
+ <Valve className="org.apache.openejb.cts.TransactionalWorkaroundLeakGuardValve"/>
+ <!-- Rollback this because it causes some other tests to fail because they test the Form authentication and Tomcat
+ Does not allow multiple authenticator valve
+ We need to hear back or to find a way to only add this for jaspic webapp or tests
+
+ <Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
+ jaspicCallbackHandlerClass="org.apache.openejb.cts.CallbackHandlerImpl"
+ />
+ -->
</Context>
diff --git a/src/test/tomee-plume/conf/context.xml b/src/test/tomee-plume/conf/context.xml
index 8b0626f..484d69a 100644
--- a/src/test/tomee-plume/conf/context.xml
+++ b/src/test/tomee-plume/conf/context.xml
@@ -30,7 +30,12 @@
-->
<Valve className="org.apache.openejb.cts.TransactionalWorkaroundLeakGuardValve"/>
+ <!-- Rollback this because it causes some other tests to fail because they test the Form authentication and Tomcat
+ Does not allow multiple authenticator valve
+ We need to hear back or to find a way to only add this for jaspic webapp or tests
+
<Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
jaspicCallbackHandlerClass="org.apache.openejb.cts.CallbackHandlerImpl"
/>
+ -->
</Context>
diff --git a/src/test/tomee-plus/conf/context.xml b/src/test/tomee-plus/conf/context.xml
index d070f59..0be9958 100644
--- a/src/test/tomee-plus/conf/context.xml
+++ b/src/test/tomee-plus/conf/context.xml
@@ -29,7 +29,13 @@
<Manager pathname="" />
-->
+ <Valve className="org.apache.openejb.cts.TransactionalWorkaroundLeakGuardValve"/>
+ <!-- Rollback this because it causes some other tests to fail because they test the Form authentication and Tomcat
+ Does not allow multiple authenticator valve
+ We need to hear back or to find a way to only add this for jaspic webapp or tests
+
<Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
- jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"
+ jaspicCallbackHandlerClass="org.apache.openejb.cts.CallbackHandlerImpl"
/>
+ -->
</Context>
diff --git a/src/test/tomee/conf/context.xml b/src/test/tomee/conf/context.xml
index 237913b..0be9958 100644
--- a/src/test/tomee/conf/context.xml
+++ b/src/test/tomee/conf/context.xml
@@ -17,19 +17,25 @@
-->
<!-- The contents of this file will be loaded for each web application -->
<Context crossContext="true" resourceOnlyServlets="jsp" jndiExceptionOnFailedWrite="false">
- <CookieProcessor className="org.apache.tomcat.util.http.LegacyCookieProcessor" alwaysAddExpires="true" forwardSlashIsSeparator="false" />
- <!-- Default set of monitored resources. If one of these changes, the -->
- <!-- web application will be reloaded. -->
- <WatchedResource>WEB-INF/web.xml</WatchedResource>
- <WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
- <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
+ <CookieProcessor className="org.apache.tomcat.util.http.LegacyCookieProcessor" alwaysAddExpires="true" forwardSlashIsSeparator="false" />
+ <!-- Default set of monitored resources. If one of these changes, the -->
+ <!-- web application will be reloaded. -->
+ <WatchedResource>WEB-INF/web.xml</WatchedResource>
+ <WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
+ <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
- <!-- Uncomment this to disable session persistence across Tomcat restarts -->
- <!--
- <Manager pathname="" />
- -->
+ <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+ <!--
+ <Manager pathname="" />
+ -->
- <Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
- jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"
- />
+ <Valve className="org.apache.openejb.cts.TransactionalWorkaroundLeakGuardValve"/>
+ <!-- Rollback this because it causes some other tests to fail because they test the Form authentication and Tomcat
+ Does not allow multiple authenticator valve
+ We need to hear back or to find a way to only add this for jaspic webapp or tests
+
+ <Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
+ jaspicCallbackHandlerClass="org.apache.openejb.cts.CallbackHandlerImpl"
+ />
+ -->
</Context>
