[tomee-tck] 02/02: Fix valve with our callback handler instead of tomcat

[jl...@apache.org]

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 0a6610f07d7b34184a2232d4f78c9c53a6066a61
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Fri Jul 24 22:43:33 2020 +0200

    Fix valve with our callback handler instead of tomcat
---
 pom.xml                                 | 2 +-
 src/test/resources/testsuite.properties | 3 ++-
 src/test/tomee-plume/conf/context.xml   | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index dbc4735..2614ded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -927,7 +927,7 @@
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
               <excludeTransitive>true</excludeTransitive>
-              <includeArtifactIds>hawtbuf,tomcat-websocket,tomcat-util,tomcat-util-scan,tomcat-juli,tomcat-api,openejb-lite,activemq-client,tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
+              <includeArtifactIds>hawtbuf,tomcat-websocket,tomcat-util,tomcat-util-scan,tomcat-juli,tomcat-catalina,tomee-security,tomcat-api,openejb-lite,activemq-client,tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
             </configuration>
           </execution>
           <execution>
diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties
index d9ab4b4..78e3d9e 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -235,4 +235,5 @@ vendor.authconfig.factory=org.apache.catalina.authenticator.jaspic.AuthConfigFac
 provider.configuration.file=%basedir%/%openejb.home%/conf/ProviderConfiguration.xml
 j2eelogin.name=j2ee
 j2eelogin.password=j2ee
-servlet.is.jsr115.compatible=false
\ No newline at end of file
+servlet.is.jsr115.compatible=false
+logical.hostname.servlet=Catalina/localhost
\ No newline at end of file
diff --git a/src/test/tomee-plume/conf/context.xml b/src/test/tomee-plume/conf/context.xml
index 023c798..9736302 100644
--- a/src/test/tomee-plume/conf/context.xml
+++ b/src/test/tomee-plume/conf/context.xml
@@ -28,4 +28,8 @@
     <!--
     <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"/>
 </Context>