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
commit 8fa8e1034592fb1ee793c0e07aa98ac3159c4ab2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 25 16:48:02 2024 +0000
Use HTTP by default
---
.../tck/servlet/TomcatServletTckConfiguration.java | 30 +++++++++++-----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git
a/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
b/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
index 19c554f..f682bef 100644
---
a/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
+++
b/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
@@ -64,21 +64,7 @@ public class TomcatServletTckConfiguration implements
LoadableExtension {
Connector connectorHttp = tomcat.getConnector();
int localPort;
- if ("http".equals(System.getProperty("arquillian.launch")))
{
- // HTTP used for all tests apart from CLIENT-CERT
-
- // Add trailer headers used in TCK to allow list
- connectorHttp.setProperty("allowedTrailerHeaders",
"myTrailer,myTrailer2");
- 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");
- } else {
+ if
("https".equals(System.getProperty("arquillian.launch"))) {
// Need to enabled HTTPS - only used for client-cert
tests
Connector connectorHttps = new Connector();
connectorHttps.setPort(0);
@@ -127,6 +113,20 @@ public class TomcatServletTckConfiguration implements
LoadableExtension {
// Create the user
tomcat.addUser("CN=CTS, OU=Java Software, O=Sun
Microsystems Inc., L=Burlington, ST=MA, C=US", "must-be-non-null");
tomcat.addRole("CN=CTS, OU=Java Software, O=Sun
Microsystems Inc., L=Burlington, ST=MA, C=US", "Administrator");
+ } else {
+ // HTTP used for all tests apart from CLIENT-CERT
+
+ // Add trailer headers used in TCK to allow list
+ connectorHttp.setProperty("allowedTrailerHeaders",
"myTrailer,myTrailer2");
+ 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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
