[JBWS-4027] Misc fixes to make wsconsume/wsprovide tasks run and most…

… of testsuite passing
jbossws · Mar 15, 2017 · d86cbd5 · d86cbd5
1 parent ca251b1
commit d86cbd5
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 16 deletions.
diff --git a/modules/client/pom.xml b/modules/client/pom.xml
@@ -229,6 +229,32 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>codemodel</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xsom</groupId>
+      <artifactId>xsom</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind.external</groupId>
+      <artifactId>rngom</artifactId>
+    </dependency>
+
+    <!-- Explicit saaj-impl dependency in synch with default SAAJ factories expected by our SAAJ API -->
+    <dependency>
+      <groupId>com.sun.xml.messaging.saaj</groupId>
+      <artifactId>saaj-impl</artifactId>
+      <version>1.3.16-jbossorg-1</version>
+    </dependency>
+
 
     <!-- jboss provided -->
     <dependency>

diff --git a/modules/server/pom.xml b/modules/server/pom.xml
@@ -223,6 +223,24 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>codemodel</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xsom</groupId>
+      <artifactId>xsom</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind.external</groupId>
+      <artifactId>rngom</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.xml.bind</groupId>
       <artifactId>jboss-jaxb-api_2.2_spec</artifactId>

diff --git a/modules/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java b/modules/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java
@@ -167,9 +167,14 @@ private static AppclientProcess newAppclientProcess(final String archive, final
          final ProcessBuilder pb = new ProcessBuilder().command(args);
          // always propagate IPv6 related properties
          final StringBuilder javaOptsValue = new StringBuilder();
+         String additionalJVMArgs = System.getProperty("additionalJvmArgs");
+         if (additionalJVMArgs != null) {
+            javaOptsValue.append(additionalJVMArgs).append(" ");
+         } else {
+            javaOptsValue.append("-Djava.net.preferIPv4Stack=").append(System.getProperty("java.net.preferIPv4Stack", "true")).append(" ");
+            javaOptsValue.append("-Djava.net.preferIPv6Addresses=").append(System.getProperty("java.net.preferIPv6Addresses", "false")).append(" ");
+         }
          javaOptsValue.append("-Djboss.bind.address=").append(undoIPv6Brackets(System.getProperty("jboss.bind.address", "localhost"))).append(" ");
-         javaOptsValue.append("-Djava.net.preferIPv4Stack=").append(System.getProperty("java.net.preferIPv4Stack", "true")).append(" ");
-         javaOptsValue.append("-Djava.net.preferIPv6Addresses=").append(System.getProperty("java.net.preferIPv6Addresses", "false")).append(" ");
          String appclientDebugOpts = System.getProperty("APPCLIENT_DEBUG_OPTS", null);
          if (appclientDebugOpts != null && appclientDebugOpts.trim().length() > 0)
             javaOptsValue.append(appclientDebugOpts).append(" ");

diff --git a/...f-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTestCase.java b/...f-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTestCase.java
@@ -142,7 +142,9 @@ protected List<Integer> runJBossModulesClient(final String strategy,
       final File f = new File(JBossWSTestHelper.getTestArchiveDir(), CLIENT_JAR);
 
       //java -jar $JBOSS_HOME/jboss-modules.jar -mp $JBOSS_HOME/modules -jar client.jar
-      String props = " -Djavax.xml.ws.spi.Provider=" + ProviderImpl.class.getName() + " -Dlog4j.output.dir=" + System.getProperty("log4j.output.dir") +
+      String additionalJVMArgs = System.getProperty("additionalJvmArgs", "");
+      additionalJVMArgs = additionalJVMArgs.replace('\n', ' ');
+      String props = " " + additionalJVMArgs + " -Djavax.xml.ws.spi.Provider=" + ProviderImpl.class.getName() + " -Dlog4j.output.dir=" + System.getProperty("log4j.output.dir") +
             " -D" + Constants.JBWS_CXF_JAXWS_CLIENT_BUS_STRATEGY + "=" + strategy + " -jar " + jbmjar + " -mp " + jbm;
       final String command = javaCmd + props + " -jar " + f.getAbsolutePath() + " " + wsdlAddress + " " + threadPoolSize + " " + invocations;
       ByteArrayOutputStream bout = new ByteArrayOutputStream();

diff --git a/modules/testsuite/pom.xml b/modules/testsuite/pom.xml
@@ -311,6 +311,8 @@
                  <test.username>${test.username}</test.username>
                  <test.password>${test.password}</test.password>
                  <wsdl.publish.location>${wsdl.publish.location}</wsdl.publish.location>
+                 <additionalJvmArgs>${additionalJvmArgs}</additionalJvmArgs>
+                 <jboss.version>${jboss.version}</jboss.version>
               </systemPropertyVariables>
             </configuration>
           </execution>
@@ -352,6 +354,8 @@
                  <test.classes.directory>${test.classes.directory}</test.classes.directory>
                  <test.resources.directory>${test.resources.directory}</test.resources.directory>
                  <wsdl.publish.location>${wsdl.publish.location}</wsdl.publish.location>
+                 <additionalJvmArgs>${additionalJvmArgs}</additionalJvmArgs>
+                 <jboss.version>${jboss.version}</jboss.version>
               </systemPropertyVariables>
             </configuration>
           </execution>
@@ -378,7 +382,6 @@
   <!-- Profiles -->
   <profiles>
 
-
     <!-- 
     Name:  download
     Descr: Download WildFly  
@@ -436,7 +439,7 @@
         </property>
       </activation>
       <properties>
-        <surefire.jvm.args>${surefire.security.args} ${surefire.memory.args} ${modular.jdk.args} ${modular.jdk.props} ${surefire.jdwp.args}</surefire.jvm.args>
+        <surefire.jvm.args>${surefire.security.args} ${surefire.memory.args} ${modular.jdk.props} ${surefire.jdwp.args}</surefire.jvm.args>
       </properties>
     </profile>
     <profile>
@@ -447,7 +450,7 @@
         </property>
       </activation>
       <properties>
-        <surefire.jvm.args>${surefire.security.args} ${surefire.memory.args} ${modular.jdk.args} ${modular.jdk.props}</surefire.jvm.args>
+        <surefire.jvm.args>${surefire.security.args} ${surefire.memory.args} ${modular.jdk.props}</surefire.jvm.args>
       </properties>
     </profile>
 

diff --git a/modules/testsuite/shared-tests/pom.xml b/modules/testsuite/shared-tests/pom.xml
@@ -129,6 +129,7 @@
                     <property name="project.version" value="${project.version}" />
                     <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
                     <property name="log4j.output.dir" value="${log4j.output.dir}" />
+                    <property name="additional.jvm.args" value="${modular.jdk.args} ${modular.jdk.props}" />
                     <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" />
                   </target>
                 </configuration>
@@ -146,6 +147,7 @@
                     <property name="project.version" value="${project.version}" />
                     <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
                     <property name="log4j.output.dir" value="${log4j.output.dir}" />
+                    <property name="additional.jvm.args" value="${modular.jdk.args} ${modular.jdk.props}" />
                     <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide" />
                   </target>
                 </configuration>

diff --git a/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml b/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
@@ -64,6 +64,7 @@
       log4jConf="${log4j.conf}"
       loggingDir="${log4j.output.dir}"
       fork="true"
+      additional.jvm.args="${additional.jvm.args}"
     />
 
     <wsconsume-macro
@@ -73,6 +74,7 @@
       log4jConf="${log4j.conf}"
       loggingDir="${log4j.output.dir}"
       fork="true"
+      additional.jvm.args="${additional.jvm.args}"
     />
   </target>
 
@@ -84,6 +86,7 @@
     <attribute name="log4jConf"/>
     <attribute name="loggingDir"/>
     <attribute name="fork"/>
+  	<attribute name="additional.jvm.args"/>
 
     <sequential>
       <wsconsume
@@ -93,13 +96,14 @@
         destdir="@{outputdir}"
         nocompile="true"
         keep="true"
-        verbose="false"
+        verbose="true"
         target="2.2"
         fork="@{fork}"
       >
         <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
         <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
         <jvmarg line="-Djavax.xml.accessExternalSchema=file,http"/>
+      	<jvmarg line="@{additional.jvm.args}"/>
       </wsconsume>
     </sequential>
 

diff --git a/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml b/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
@@ -56,6 +56,7 @@
       loggingDir="${log4j.output.dir}"
       resourcesDir="jaxws/jbws2960"
       fork="true"
+      additional.jvm.args="${additional.jvm.args}"
     />
   </target>
 
@@ -68,6 +69,7 @@
     <attribute name="loggingDir"/>
     <attribute name="resourcesDir"/>
     <attribute name="fork"/>
+  	<attribute name="additional.jvm.args"/>
 
     <sequential>
       <wsprovide
@@ -82,6 +84,7 @@
         <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
         <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
         <jvmarg line="-Djavax.xml.accessExternalSchema=file,http"/>
+      	<jvmarg line="@{additional.jvm.args}"/>
       </wsprovide>
     </sequential>
 

diff --git a/...stsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java b/...stsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
@@ -127,7 +127,9 @@ private void runJBossModulesClient(String clientJar) throws Exception {
       final File f = new File(JBossWSTestHelper.getTestArchiveDir(), clientJar);
 
       //java -jar $JBOSS_HOME/jboss-modules.jar -mp $JBOSS_HOME/modules -jar client.jar
-      String props = " -Dlog4j.output.dir=" + System.getProperty("log4j.output.dir") + " -jar " + jbmjar + " -mp " + jbm; 
+      String additionalJVMArgs = System.getProperty("additionalJvmArgs", "");
+      additionalJVMArgs = additionalJVMArgs.replace('\n', ' ');
+      String props = " " + additionalJVMArgs + " -Dlog4j.output.dir=" + System.getProperty("log4j.output.dir") + " -jar " + jbmjar + " -mp " + jbm; 
       final String command = javaCmd + props + " -jar " + f.getAbsolutePath() + " " + getServerHost() + " " + getServerPort();
       ByteArrayOutputStream bout = new ByteArrayOutputStream();
       executeCommand(command, bout);

diff --git a/pom.xml b/pom.xml
@@ -65,7 +65,7 @@
     <jbossws.api.version>1.0.4-SNAPSHOT</jbossws.api.version>
     <jbossws.spi.version>3.2.0-SNAPSHOT</jbossws.spi.version>
     <jbossws.common.version>3.2.0-SNAPSHOT</jbossws.common.version>
-    <jbossws.common.tools.version>1.2.3.Final</jbossws.common.tools.version>
+    <jbossws.common.tools.version>1.2.4-SNAPSHOT</jbossws.common.tools.version>
     <jbossws.wildfly902.version>5.1.1.Final</jbossws.wildfly902.version>
     <jbossws.wildfly1000.version>5.1.4.Final</jbossws.wildfly1000.version>
     <jbossws.wildfly1010.version>5.2.0-SNAPSHOT</jbossws.wildfly1010.version>
@@ -106,6 +106,7 @@
     <velocity.version>1.7</velocity.version>
     <xerces.version>2.9.1</xerces.version>
     <xmlsec.version>2.0.8</xmlsec.version>
+    <xsom.version>20140925</xsom.version>
     <wss4j.version>2.1.8</wss4j.version>
     <wstx.version>5.0.3</wstx.version>
     <shrinkwrap.version>1.1.3</shrinkwrap.version>
@@ -116,6 +117,7 @@
     <jacc.api.version>1.0.0.Final</jacc.api.version>
     <javax.inject.version>1</javax.inject.version>
     <modular.jdk.args/>
+    <modular.jdk.props/>
   </properties>
 
 
@@ -1181,6 +1183,21 @@
         <artifactId>jaxb-core</artifactId>
         <version>${jaxb.impl.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.glassfish.jaxb</groupId>
+        <artifactId>codemodel</artifactId>
+        <version>${jaxb.impl.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.xsom</groupId>
+        <artifactId>xsom</artifactId>
+        <version>${xsom.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.xml.bind.external</groupId>
+        <artifactId>rngom</artifactId>
+        <version>${jaxb.impl.version}</version>
+      </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
@@ -1371,7 +1388,7 @@
         <jbossws.integration.target>wildfly902</jbossws.integration.target>
         <jboss.home>${server.home}</jboss.home>
         <jboss.version>${wildfly902.version}</jboss.version>
-        <additionalJvmArgs>${ipVerArgs}</additionalJvmArgs>
+        <additionalJvmArgs>${ipVerArgs} ${modular.jdk.props} ${modular.jdk.args}</additionalJvmArgs>
         <additionalGroovyScriptSuffix></additionalGroovyScriptSuffix>
       </properties>
       <modules>
@@ -1390,7 +1407,7 @@
         <jbossws.integration.target>wildfly1000</jbossws.integration.target>
         <jboss.home>${server.home}</jboss.home>
         <jboss.version>${wildfly1000.version}</jboss.version>
-        <additionalJvmArgs>${ipVerArgs}</additionalJvmArgs>
+        <additionalJvmArgs>${ipVerArgs} ${modular.jdk.props} ${modular.jdk.args}</additionalJvmArgs>
         <additionalGroovyScriptSuffix></additionalGroovyScriptSuffix>
       </properties>
       <modules>
@@ -1409,7 +1426,7 @@
         <jbossws.integration.target>wildfly1010</jbossws.integration.target>
         <jboss.home>${server.home}</jboss.home>
         <jboss.version>${wildfly1010.version}</jboss.version>
-        <additionalJvmArgs>${ipVerArgs}</additionalJvmArgs>
+        <additionalJvmArgs>${ipVerArgs} ${modular.jdk.props} ${modular.jdk.args}</additionalJvmArgs>
         <additionalGroovyScriptSuffix></additionalGroovyScriptSuffix>
       </properties>
       <modules>
@@ -1428,7 +1445,7 @@
         <jbossws.integration.target>wildfly1100</jbossws.integration.target>
         <jboss.home>${server.home}</jboss.home>
         <jboss.version>${wildfly1100.version}</jboss.version>
-        <additionalJvmArgs>${ipVerArgs} ${modular.jdk.args}</additionalJvmArgs>
+        <additionalJvmArgs>${ipVerArgs} ${modular.jdk.props} ${modular.jdk.args}</additionalJvmArgs>
         <additionalGroovyScriptSuffix></additionalGroovyScriptSuffix>
       </properties>
       <modules>
@@ -1463,20 +1480,36 @@
       </activation>
       <properties>
         <modular.jdk.args>
-          --add-modules java.se.ee --upgrade-module-path /home/opalka/JDK9_MODULES/UPGRADEABLE_MODULES_JBOSSWS
-          --add-exports java.base/sun.nio.ch=ALL-UNNAMED
+          --add-modules java.se.ee
+        </modular.jdk.args>
+        <modular.jdk.props>
+          -Dsun.util.logging.disableCallerCheck=true
+          -Dsun.reflect.debugModuleAccessChecks=true
+          --add-exports=java.base/sun.nio.ch=ALL-UNNAMED
+          --add-exports=java.security.sasl/com.sun.security.sasl=ALL-UNNAMED
+          --add-exports=java.security.sasl/com.sun.security.sasl.digest=ALL-UNNAMED
+          --add-exports=java.security.sasl/com.sun.security.sasl.ntlm=ALL-UNNAMED
+          --add-exports=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax=ALL-UNNAMED
+          --add-exports=java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED
+          --add-exports=java.xml/com.sun.org.apache.xpath.internal.jaxp=ALL-UNNAMED
+          --add-exports=java.xml/com.sun.xml.internal.stream=ALL-UNNAMED
+          --add-exports=java.xml/javax.xml.namespace=ALL-UNNAMED
+          --add-exports=jdk.security.jgss/com.sun.security.sasl.gsskerb=ALL-UNNAMED
           --add-opens=java.base/java.lang=ALL-UNNAMED
           --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
           --add-opens=java.base/java.security=ALL-UNNAMED
           --add-opens=java.base/java.io=ALL-UNNAMED
           --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
           --add-opens=java.base/java.math=ALL-UNNAMED
           --add-opens=java.base/java.net=ALL-UNNAMED
+          --add-opens=java.base/java.nio=ALL-UNNAMED
           --add-opens=java.base/java.util=ALL-UNNAMED
           --add-opens=java.base/jdk.internal.reflect=ALL-UNNAMED
+          --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
           --add-opens=java.management/javax.management=ALL-UNNAMED
           --add-opens=java.management/javax.management.openmbean=ALL-UNNAMED
-        </modular.jdk.args>
+          --add-opens=java.xml/javax.xml.namespace=ALL-UNNAMED
+        </modular.jdk.props>
         <!--modular.jdk.props>-Dsun.util.logging.disableCallerCheck=true -Dsun.reflect.debugModuleAccessChecks=true -Djaxb.debug=true</modular.jdk.props-->
       </properties>
     </profile>