Update concurrency runner and domain.xml to execute sigtest on server

Signed-off-by: Arjan Tijms <arjan.tijms@gmail.com>
eclipse-ee4j · Jun 22, 2022 · 159b4ae · 159b4ae
1 parent 324c234
commit 159b4ae
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/appserver/admin/template/src/main/resources/config/domain.xml b/appserver/admin/template/src/main/resources/config/domain.xml
@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -216,6 +217,8 @@
         <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>
+        <jvm-options>--add-exports=java.base/jdk.internal.vm.annotation=ALL-UNNAMED</jvm-options>
+        <jvm-options>--add-opens=java.base/jdk.internal.vm.annotation=ALL-UNNAMED</jvm-options>
       </java-config>
       <network-config>
         <protocols>
@@ -407,6 +410,8 @@
              <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>
+             <jvm-options>--add-exports=java.base/jdk.internal.vm.annotation=ALL-UNNAMED</jvm-options>
+             <jvm-options>--add-opens=java.base/jdk.internal.vm.annotation=ALL-UNNAMED</jvm-options>
          </java-config>
          <availability-service>
              <web-container-availability/>

diff --git a/appserver/tests/tck/concurrency/pom.xml b/appserver/tests/tck/concurrency/pom.xml
@@ -179,6 +179,14 @@
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${glassfish.root}/glassfish7/glassfish/lib</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.netbeans.tools</groupId>
+                                    <artifactId>sigtest-maven-plugin</artifactId>
+                                    <version>1.6</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${glassfish.root}/glassfish7/glassfish/lib</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -216,10 +224,10 @@
                         <!--
                         <java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
                         
+                        -->
                         <glassfish.systemProperties>
-                            java.util.logging.config.file=${project.build.directory}/test-classes/logging.properties
+                            jimage.dir=${project.build.directory}/jimage
                         </glassfish.systemProperties>
-                        -->
 
                         <glassfish.postBootCommands>
                             create-file-user --groups staff:mgr --passwordfile ${project.build.directory}/test-classes/j2ee.pass j2ee