(tomcat-tck) branch main updated: Configure for most recently staged JSP TCK

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-tck.git


The following commit(s) were added to refs/heads/main by this push:
     new 71ebd55  Configure for most recently staged JSP TCK
71ebd55 is described below

commit 71ebd556b0122a8016f3c76e78e5005e61ff91cb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Apr 1 16:25:13 2024 +0100

    Configure for most recently staged JSP TCK
---
 jsp-tck/pom.xml                                                | 10 +++++++++-
 .../org/apache/tomcat/tck/jsp/TomcatJspTckConfiguration.java   |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/jsp-tck/pom.xml b/jsp-tck/pom.xml
index 79ae323..9ebde91 100644
--- a/jsp-tck/pom.xml
+++ b/jsp-tck/pom.xml
@@ -110,6 +110,10 @@
                         </goals>
                         <configuration>
                             
<dependenciesToScan>jakarta.tck:jakarta-pages-tck</dependenciesToScan>
+                            <excludes>
+                                <!-- Exclude platform tests -->
+                                
<exclude>com/sun/ts/tests/jsp/spec/tagext/resource/**</exclude>
+                            </excludes>
                             <forkCount>5</forkCount>
                             <reuseForks>false</reuseForks>
                             <systemPropertyVariables>
@@ -118,8 +122,12 @@
                                 
<securedWebServicePort>8443</securedWebServicePort>
                                 <ws_wait>5</ws_wait>
                                 <junit.log.traceflag>true</junit.log.traceflag>
-                                
<porting.ts.url.class.1>ee.jakarta.tck.pages.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
+                                
<porting.ts.url.class.1>com.sun.ts.tests.jsp.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
                                 
<sigTestClasspath>${settings.localRepository}/org/apache/tomcat/tomcat-jsp-api/${tomcat.version}/tomcat-jsp-api-${tomcat.version}.jar:${settings.localRepository}/org/apache/tomcat/tomcat-el-api/${tomcat.version}/tomcat-el-api-${tomcat.version}.jar:${settings.localRepository}/org/apache/tomcat/tomcat-servlet-api/${tomcat.version}/tomcat-servlet-api-${tomcat.version}.jar:${env.JAVA_HOME}/jmods/java.base</sigTestClasspath>
+                                <user>j2ee</user>
+                                <password>j2ee</password>
+                                <authuser>javajoe</authuser>
+                                <authpassword>javajoe</authpassword>
                             </systemPropertyVariables>
                         </configuration>
                     </execution>
diff --git 
a/jsp-tck/src/test/java/org/apache/tomcat/tck/jsp/TomcatJspTckConfiguration.java
 
b/jsp-tck/src/test/java/org/apache/tomcat/tck/jsp/TomcatJspTckConfiguration.java
index f7dbb38..7eb507b 100644
--- 
a/jsp-tck/src/test/java/org/apache/tomcat/tck/jsp/TomcatJspTckConfiguration.java
+++ 
b/jsp-tck/src/test/java/org/apache/tomcat/tck/jsp/TomcatJspTckConfiguration.java
@@ -51,6 +51,14 @@ public class TomcatJspTckConfiguration implements 
LoadableExtension {
                 Connector connectorHttp = tomcat.getConnector();
                 int localPort = connectorHttp.getLocalPort();
 
+                // Add expected users
+                tomcat.addUser("j2ee", "j2ee");
+                tomcat.addRole("j2ee", "Administrator");
+                tomcat.addRole("j2ee", "Employee");
+                tomcat.addUser("javajoe", "javajoe");
+                tomcat.addRole("javajoe", "VP");
+                tomcat.addRole("javajoe", "Manager");
+
                 // Update Arquillian configuration with port being used by 
Tomcat
                 Field configurationField = 
Tomcat10EmbeddedContainer.class.getDeclaredField("configuration");
                 configurationField.setAccessible(true);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org