Merge branch 'master' of https://github.com/starksm64/jakartaee-tck

bin/xml/ts.top.import.xml

@@ -39,6 +39,14 @@
     </condition>
     <property name="noSecurityManager" value="false"/>
 
+    <if>
+        <isset property="env.JVMOPTS_RUNTESTCOMMAND"/>
+        <then>
+            <property name="JVMOPTS_RUNTESTCOMMAND"
+                        value="${env.JVMOPTS_RUNTESTCOMMAND}"/>
+        </then>
+    </if>
+
     <!-- Set the archives to deploy - default to wars-->
     <target name="setup.archive.set">
         <fileset dir="${dist.dir}/${pkg.dir}" id="deploy.vi.archive.set">

docker/run_jakartaeetck.sh

@@ -162,6 +162,13 @@ ${CTS_HOME}/ri/${GF_RI_TOPLEVEL_DIR}/glassfish/bin/asadmin --user admin --passwo
 ${CTS_HOME}/ri/${GF_RI_TOPLEVEL_DIR}/glassfish/bin/asadmin --user admin --passwordfile ${ADMIN_PASSWORD_FILE} stop-domain
 ${CTS_HOME}/ri/${GF_RI_TOPLEVEL_DIR}/glassfish/bin/asadmin --user admin --passwordfile ${ADMIN_PASSWORD_FILE} start-domain
 
+if [[ "$JDK" == "JDK17" || "$JDK" == "jdk17" ]];then
+   echo "enabling GlassFish --add-opens options for JDK17"
+   export JVMOPTS_RUNTESTCOMMAND="--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
+   echo "will use $JVMOPTS_RUNTESTCOMMAND "
+fi
+
+
 # Change default ports for RI
 ${CTS_HOME}/ri/${GF_RI_TOPLEVEL_DIR}/glassfish/bin/asadmin --interactive=false  --user admin --passwordfile ${ADMIN_PASSWORD_FILE} delete-jvm-options -Dosgi.shell.telnet.port=6666
 ${CTS_HOME}/ri/${GF_RI_TOPLEVEL_DIR}/glassfish/bin/asadmin --user admin --passwordfile ${ADMIN_PASSWORD_FILE} create-jvm-options -Dosgi.shell.telnet.port=6667

install/jakartaee/bin/ts.jte

@@ -201,6 +201,12 @@ javaee.home=
 orb.host=localhost
 orb.port=3699
 
+########################################################################
+## Environment variable JVMOPTS_RUNTESTCOMMAND may be set to JVM 
+#  options to pass when running ExecTSTestCmd command.
+#  This is a convenience intended for adding Java SE 17+ options.
+########################################################################
+
 ########################################################################
 ## Settings for Sun RI Java EE Implementation
 # @javaee.home.ri The location of the RI.
@@ -1092,6 +1098,7 @@ s1as.classpathsuffix=${javaee.home}/lib/tsprovider.jar
 #                        test directories which make use of this command
 #                        are servlet and jsp.
 ########################################################################
+
 command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
         CLASSPATH=${ts.harness.classpath}${pathsep}${ts.home}/classes${pathsep}\
         ${JAVA_HOME}/../lib/tools.jar${pathsep}\
@@ -1125,6 +1132,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
         SYSTEMROOT=${SYSTEMROOT} \
         PATH="${javaee.home}/nativelib" \
         ${JAVA_HOME}/bin/java \
+        ${JVMOPTS_RUNTESTCOMMAND} \
         -Xss2048k \
         -Dcts.tmp=$harness.temp.directory \
         -Djava.protocol.handler.pkgs=javax.net.ssl \
@@ -1163,6 +1171,7 @@ command.testExecuteAppClient= \
         APPCPATH=${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/cts.jar${pathsep}${ts.home}/lib/glassfishporting.jar${pathsep}${javaee.home}/lib/jpa_alternate_provider.jar${pathsep}${ts.home}/lib/tssv.jar${pathsep}${javaee.home}/modules/weld-osgi-bundle.jar${pathsep}${javaee.home}/modules/jakarta.enterprise.cdi-api.jar \
         TZ=${tz} \
         ${JAVA_HOME}/bin/java \
+        ${JVMOPTS_RUNTESTCOMMAND} \
         -Djava.system.class.loader=org.glassfish.appclient.client.acc.agent.ACCAgentClassLoader  \
         -Djava.security.policy=${javaee.home}/lib/appclient/client.policy \
         -Dcts.tmp=$harness.temp.directory \
@@ -1233,6 +1242,7 @@ command.testExecuteEjbEmbed=com.sun.ts.lib.harness.ExecTSTestCmd \
         windir=${windir} \
         SYSTEMROOT=${SYSTEMROOT} \
         ${JAVA_HOME}/bin/java \
+        ${JVMOPTS_RUNTESTCOMMAND} \
         -Dcts.tmp=$harness.temp.directory \
         -Djava.util.logging.config.file=${javaee.home}/domains/domain1/config/logging.properties \
         -Dtest.ejb.stateful.timeout.wait.seconds=${test.ejb.stateful.timeout.wait.seconds} \
@@ -1252,6 +1262,7 @@ command.testExecuteAppClient2= \
         APPCPATH=${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/cts.jar${pathsep}${ts.home}/lib/glassfishporting.jar${pathsep}${ts.home}/lib/riinterceptors.jar \
 	TZ=${tz} \
         ${RI_JAVA_HOME}/bin/java \
+        ${JVMOPTS_RUNTESTCOMMAND} \
         -Djava.system.class.loader=org.glassfish.appclient.client.acc.agent.ACCAgentClassLoader \
         -Djava.security.policy=${javaee.home.ri}/lib/appclient/client.policy \
         -Dcts.tmp=$harness.temp.directory \
@@ -1315,6 +1326,7 @@ command.testExecute2=com.sun.ts.lib.harness.ExecTSTestCmd \
         SYSTEMROOT=${SYSTEMROOT} \
         PATH="${javaee.home}/nativelib" \
         ${RI_JAVA_HOME}/bin/java \
+        ${JVMOPTS_RUNTESTCOMMAND} \
         -Dcts.tmp=$harness.temp.directory \
         -Djava.protocol.handler.pkgs=javax.net.ssl \
         -Djavax.net.ssl.keyStore=${bin.dir}/certificates/clientcert.jks \

src/com/sun/ts/tests/integration/sec/secbasicssl/basicSSL.jsp

@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2006, 2022 Oracle and/or its affiliates and others.
+    All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -37,7 +38,7 @@
     // supported.
     //
     // Check that isSecure() returns true, indicating that this is indeed
-    // an SSL session.  Also, check that the request URL begins with https.
+    // an SSL session.  Also, check that the scheme is https.
     // We cannot do much more than this from here 
     // to guarantee that it is truly SSL, but this is a good failsafe.  
     String testName = "test_login_basic_over_ssl";
@@ -50,11 +51,9 @@
 	    fail = true;
 	}
 
-	String requestURL = HttpUtils.getRequestURL( request ).toString();
-	boolean isHttps = requestURL.toLowerCase().startsWith( "https" );
-	if( !isHttps ) {
+	if( !"https".equals(request.getScheme()) ) {
             out.println( testName + ": " + FAILSTRING +
-                " - must start with https." );
+                " - must use https." );
 
 	    fail = true;
 	}