You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2020/11/10 11:20:34 UTC

[tomee-tck] 01/10: Override Tomcat Callback Handler with our own fork

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git

commit b4ca08965eab06f6f43e65a56f084f85862f57ee
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Tue Nov 10 11:34:22 2020 +0100

    Override Tomcat Callback Handler with our own fork
---
 src/test/{tomee-plume => tomcat}/conf/context.xml  | 26 +++++++++++-----------
 src/test/tomee-plume/conf/context.xml              |  4 ++--
 .../{tomee-plume => tomee-plus}/conf/context.xml   |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/test/tomee-plume/conf/context.xml b/src/test/tomcat/conf/context.xml
similarity index 51%
copy from src/test/tomee-plume/conf/context.xml
copy to src/test/tomcat/conf/context.xml
index 9736302..18a9e49 100644
--- a/src/test/tomee-plume/conf/context.xml
+++ b/src/test/tomcat/conf/context.xml
@@ -17,19 +17,19 @@
 -->
 <!-- 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>
+  <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="" />
+  -->
 
-    <!-- this is for Jaspic so we can override the default CallbackHandler until we discuss on Tomcat Mailing list -->
-    <Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
-           jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"/>
+  <Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
+         jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"
+  />
 </Context>
diff --git a/src/test/tomee-plume/conf/context.xml b/src/test/tomee-plume/conf/context.xml
index 9736302..1511fcd 100644
--- a/src/test/tomee-plume/conf/context.xml
+++ b/src/test/tomee-plume/conf/context.xml
@@ -29,7 +29,7 @@
     <Manager pathname="" />
     -->
 
-    <!-- this is for Jaspic so we can override the default CallbackHandler until we discuss on Tomcat Mailing list -->
     <Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
-           jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"/>
+           jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"
+    />
 </Context>
diff --git a/src/test/tomee-plume/conf/context.xml b/src/test/tomee-plus/conf/context.xml
similarity index 91%
copy from src/test/tomee-plume/conf/context.xml
copy to src/test/tomee-plus/conf/context.xml
index 9736302..1511fcd 100644
--- a/src/test/tomee-plume/conf/context.xml
+++ b/src/test/tomee-plus/conf/context.xml
@@ -29,7 +29,7 @@
     <Manager pathname="" />
     -->
 
-    <!-- this is for Jaspic so we can override the default CallbackHandler until we discuss on Tomcat Mailing list -->
     <Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
-           jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"/>
+           jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"
+    />
 </Context>