Merge 6.x to master

.gitignore

@@ -7,6 +7,7 @@
 *.class
 target/
 .idea
+nbproject/
 nbactions.xml
 nb-configuration.xml
 .classpath
@@ -18,8 +19,16 @@ appserver/security/jaspic-provider-framework/auth.conf
 appserver/tests/appserv-tests/devtests/web/JSESSIONID
 /bundles/
 appserver/tests/appserv-tests/devtests/**/count.txt
+appserver/tests/appserv-tests/devtests/**/errors.txt
+appserver/tests/appserv-tests/devtests/**/*.log
+appserver/tests/appserv-tests/devtests/**/*.out
+appserver/tests/appserv-tests/devtests/**/build/
+appserver/tests/appserv-tests/**/results.html
+appserver/tests/appserv-tests/**/tests-results.xml
+appserver/tests/appserv-tests/security-gtest-results.xml
+appserver/tests/appserv-tests/test_results_junit.xml
+appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties
 appserver/tests/appserv-tests/devtests/connector/v3/testdb/
-appserver/tests/appserv-tests/devtests/connector/v3/**/*.log
 appserver/tests/appserv-tests/devtests/connector/v3/**/*.lck
 appserver/tests/appserv-tests/devtests/connector/v3/**/*.ctrl
 appserver/tests/appserv-tests/devtests/connector/v3/**/*.dat
@@ -29,6 +38,27 @@ appserver/tests/appserv-tests/devtests/connector/**/*.[rj]ar
 appserver/tests/appserv-tests/devtests/connector/**/tmp-*/
 appserver/tests/appserv-tests/devtests/connector/**/seg0/
 
+appserver/tests/appserv-tests/devtests/deployment/junit-4.12.jar
+appserver/tests/appserv-tests/devtests/deployment/password.txt
+
 appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
 appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
 
+appserver/tests/appserv-tests/devtests/security/jmac/soap/client/Client.java
+appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/client/Client.java
+appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/webclient/Servlet.java
+
+appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client-sun-web.xml
+appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/sun-web.xml
+appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client-sun-web.xml
+appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/sun-web.xml
+appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/sun-application-client.xml
+appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/sun-web.xml
+appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/passwordfile
+appserver/tests/appserv-tests/devtests/webservice/security/*.cer
+appserver/tests/appserv-tests/devtests/webservice/security/*.jks
+
+appserver/tests/appserv-tests/temppwd
+
+opendj-*.zip
+/opendj/

Jenkinsfile

@@ -20,7 +20,7 @@
 env.label = "glassfish-ci-pod-${UUID.randomUUID().toString()}"
 
 // Docker image defined in this project in [glassfish]/etc/docker/Dockerfile
-env.gfImage = "ee4jglassfish/ci:tini-jdk-11.0.10"
+env.gfImage = "dmatej/eclipse-jenkins-glassfish:11.0.14.1"
 
 def jobs = [
   "verifyPhase",
@@ -38,7 +38,11 @@ def jobs = [
   "connector_group_3",
   "connector_group_4",
   "jdbc_all",
-  "persistence_all"
+  "persistence_all",
+  "naming_all",
+  "deployment_all",
+  "security_all",
+  "webservice_all"
 ]
 
 def parallelStagesMap = jobs.collectEntries {
@@ -263,7 +267,7 @@ spec:
               uname -a
 
               # temporary build of external snapshot dependencies
-              mvn clean install -f ./snapshots/pom.xml -s ./snapshots/settings.xml
+              mvn clean install -f ./snapshots/pom.xml
               # Until we fix ANTLR in cmp-support-sqlstore, broken in parallel builds. Just -Pfast after the fix.
               mvn clean install -Pfastest,staging -T4C
               ./gfbuild.sh archive_bundles

README.md

@@ -46,7 +46,7 @@ You can use also some maven optimizations, ie. using `-T4C` to allow parallel bu
 ### Special Scripts
 
 * `./updateVersion.sh 6.99.99.experimental` - useful for custom distributions, so you can avoid conflicts with version in master branch.
-* `./runTests.sh 6.2.0 cdi_all` - useful to run [additional](#additional-testing) tests locally; before that edit the script and update variables so they will reflect your environment.
+* `./runtests.sh [testBlockName] [?glassfishVersion]` - useful to run [old additional tests](#old-additional-tests) locally
 * `./validateJars.sh` - uses the bnd command to check OSGI dependencies in all target directories
 
 ## Additional Testing
@@ -65,26 +65,31 @@ They are quite old and have high technical debt, but at this moment they still p
 
 :warning: if the script fails, sometimes it doesn't stop the domain and you have to do that manually.
 
-* `./runTests.sh 7.0.0 batch_all` - Usual time: 4 minutes
-* `./runTests.sh 7.0.0 cdi_all` - Usual time: 6 minutes
-* `./runTests.sh 7.0.0 connector_group_1` - Usual time: 16 minutes
-* `./runTests.sh 7.0.0 connector_group_2` - Usual time: 3 minutes
-* `./runTests.sh 7.0.0 connector_group_3` - Usual time: 4 minutes
-* `./runTests.sh 7.0.0 connector_group_4` - Usual time: 16 minutes
-* `./runTests.sh 7.0.0 deployment_all` - Not fixed yet
-* `./runTests.sh 7.0.0 ejb_group_1` - Usual time: 10 minutes
-* `./runTests.sh 7.0.0 ejb_group_2` - Usual time: 7 minutes
-* `./runTests.sh 7.0.0 ejb_group_3` - Usual time: 18 minutes
-* `./runTests.sh 7.0.0 ejb_group_embedded` - Usual time: 4 minutes
-* `./runTests.sh 7.0.0 jdbc_all` - Usual time: 20 minutes
-* `./runTests.sh 7.0.0 persistence_all` - Usual time: 3 minutes
-* `./runTests.sh 7.0.0 web_jsp` - Usual time: 8 minutes
+* `./runtests.sh batch_all` - Usual time: 1 minute
+* `./runtests.sh cdi_all` - Usual time: 6 minutes
+* `./runtests.sh connector_group_1` - Usual time: 16 minutes
+* `./runtests.sh connector_group_2` - Usual time: 3 minutes
+* `./runtests.sh connector_group_3` - Usual time: 4 minutes
+* `./runtests.sh connector_group_4` - Usual time: 16 minutes
+* `./runtests.sh deployment_all` - Usual time: 8 minutes
+* `./runtests.sh ejb_group_1` - Usual time: 10 minutes
+* `./runtests.sh ejb_group_2` - Usual time: 7 minutes
+* `./runtests.sh ejb_group_3` - Usual time: 18 minutes
+* `./runtests.sh ejb_group_embedded` - Usual time: 4 minutes
+* `./runtests.sh ejb_group_all` - Usual time: 4 minutes
+* `./runtests.sh jdbc_all` - Usual time: 20 minutes
+* `./runtests.sh naming_all` - Usual time: 2 minutes
+* `./runtests.sh persistence_all` - Usual time: 3 minutes
+* `./runtests.sh security_all` - Usual time: 8 minutes
+* `./runtests.sh web_jsp` - Usual time: 8 minutes
+* `./runtests.sh webservice_all` - Usual time: 10 minutes
 * `./gfbuild.sh archive_bundles && ./gftest.sh ejb_web_all` - Usual time: 4 minutes
 * `./gfbuild.sh archive_bundles && ./gftest.sh nucleus_admin_all` - Not fixed yet
-* `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_full_profile_all` - Usual time: 4 minutes
 * `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_nucleus_all` - Not fixed yet
 * `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_web_profile_all` - Usual time: 2 minutes
-* There are many tests under appserver/tests subdirectories; they are still waiting for someone's attention.
+* `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_full_profile_all` - Usual time: 4 minutes
+
+* many tests under appserver/tests subdirectories; they are still waiting for someone's attention.
 
 ## Basic Usage
 

appserver/admin/template/src/main/resources/config/domain.xml

@@ -208,12 +208,13 @@
 
         <jvm-options>-XX:NewRatio=2</jvm-options>
         <jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>
-        <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
-        <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
+        <jvm-options>--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
         <jvm-options>--add-opens=java.base/java.lang=ALL-UNNAMED</jvm-options>
         <jvm-options>--add-opens=java.base/java.util=ALL-UNNAMED</jvm-options>
-        <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+        <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
         <jvm-options>--add-opens=java.naming/javax.naming.spi=ALL-UNNAMED</jvm-options>
+        <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+        <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
         <jvm-options>--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</jvm-options>
       </java-config>
       <network-config>
@@ -398,12 +399,13 @@
              <jvm-options>-Dorg.glassfish.gmbal.no.multipleUpperBoundsException=true</jvm-options>
 
              <jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>
-             <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
-             <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
+             <jvm-options>--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
              <jvm-options>--add-opens=java.base/java.lang=ALL-UNNAMED</jvm-options>
              <jvm-options>--add-opens=java.base/java.util=ALL-UNNAMED</jvm-options>
-             <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+             <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
              <jvm-options>--add-opens=java.naming/javax.naming.spi=ALL-UNNAMED</jvm-options>
+             <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+             <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
              <jvm-options>--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</jvm-options>
          </java-config>
          <availability-service>
@@ -461,7 +463,7 @@
          </thread-pools>
          <group-management-service/>
          <!--%%%DEFAULT_TOKENS_HERE%%%-->
-         <system-property name="ASADMIN_LISTENER_PORT" value="24848"/>
+         <system-property name="ASADMIN_LISTENER_PORT" value="24848" />
          <system-property name="HTTP_LISTENER_PORT" value="28080"/>
          <system-property name="HTTP_SSL_LISTENER_PORT" value="28181"/>
          <system-property name="IIOP_LISTENER_PORT" value="23700"/>

appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/CLIBootstrap.java

@@ -290,6 +290,7 @@ private void addProperties(final StringBuilder command) {
         command.append(' ').append("--add-opens=java.base/java.lang=ALL-UNNAMED");
         command.append(' ').append(INSTALL_ROOT_PROPERTY_EXPR).append(quote(gfInfo.home().getAbsolutePath()));
         command.append(' ').append(SECURITY_POLICY_PROPERTY_EXPR).append(quote(gfInfo.securityPolicy().getAbsolutePath()));
+        command.append(' ').append("-classpath").append(' ').append(gfInfo.agentJarPath()).append(File.pathSeparatorChar).append('.');
         command.append(' ').append(SYSTEM_CLASS_LOADER_PROPERTY_EXPR);
         command.append(' ').append("-Xshare:off");
         command.append(' ').append(SECURITY_AUTH_LOGIN_CONFIG_PROPERTY_EXPR).append(quote(gfInfo.loginConfig().getAbsolutePath()));
@@ -917,10 +918,6 @@ File configxml() {
             return configXMLFile;
         }
 
-        String[] endorsedPaths() {
-            return new String[] { new File(lib, "endorsed").getAbsolutePath(), new File(modules, "endorsed").getAbsolutePath() };
-        }
-
         String extPaths() {
             return new File(lib, "ext").getAbsolutePath();
         }
@@ -986,10 +983,6 @@ String javaExe() {
             return System.getenv(ACCJava_ENV_VAR_NAME);
         }
 
-        File endorsed() {
-            return new File(lib(), "endorsed");
-        }
-
         File ext() {
             return new File(lib(), "ext");
         }

appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java

@@ -377,13 +377,10 @@ private void completePreparation(final Instrumentation inst) throws
 
         prepareURLStreamHandling();
 
-        //This is required for us to enable interrupt jaxws service
-        //creation calls
-        System.setProperty("jakarta.xml.ws.spi.Provider",
-                           "com.sun.enterprise.webservice.spi.ProviderImpl");
+        //This is required for us to enable interrupt jaxws service creation calls
+        System.setProperty("jakarta.xml.ws.spi.Provider", "com.sun.xml.ws.spi.ProviderImpl");
         //InjectionManager's injectClass will be called from getMainMethod
 
-
         // Load any managed beans
         ManagedBeanManager managedBeanManager = habitat.getService(ManagedBeanManager.class);
         managedBeanManager.loadManagedBeans(desc.getApplication());