[jbossws-commits] JBossWS SVN: r14159 - in stack/cxf/trunk/modules/testsuite: shared-tests and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2011-04-18 16:44:53 -0400 (Mon, 18 Apr 2011)
New Revision: 14159

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
   stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
   stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
   stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
Log:
[JBWS-3229] Fixing wsprovide task invocation during testsuite build to use proper endorsed dirs


Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-04-18 16:48:31 UTC (rev 14158)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-04-18 20:44:53 UTC (rev 14159)
@@ -999,9 +999,6 @@
                  <!-- # [JBWS-3227] handles config file not found on classpath -->
                  <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
 
-                 <!-- # [JBWS-3229] DOMUtils issue on test classpath - probably missing xercesImpl on CP? -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws2960/**</exclude>
-
                  <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
                  <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
 

Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml	2011-04-18 16:48:31 UTC (rev 14158)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml	2011-04-18 20:44:53 UTC (rev 14159)
@@ -124,7 +124,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="jboss.home" value="${jboss.home}"/>
+                    <property name="endorsed.dir" value="${project.build.directory}/endorsed"/>
                     <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/>
                   </tasks>
                 </configuration>
@@ -142,7 +142,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="jboss.home" value="${jboss.home}"/>
+                    <property name="endorsed.dir" value="${project.build.directory}/endorsed"/>
                     <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/>
                     <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
                     <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>

Modified: stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml	2011-04-18 16:48:31 UTC (rev 14158)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml	2011-04-18 20:44:53 UTC (rev 14159)
@@ -20,7 +20,7 @@
       wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl"
       package="org.jboss.test.ws.jaxws.complex"
       outputDir="${tests.output.dir}"
-      jbossHome="${jboss.home}"
+      endorsedDir="${endorsed.dir}"
       log4jConf="${log4j.conf}"
       loggingDir="${log4j.output.dir}"
     />
@@ -29,7 +29,7 @@
       wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl"
       package="org.jboss.test.ws.jaxws.holder"
       outputDir="${tests.output.dir}"
-      jbossHome="${jboss.home}"
+      endorsedDir="${endorsed.dir}"
       log4jConf="${log4j.conf}"
       loggingDir="${log4j.output.dir}"
     />
@@ -41,7 +41,7 @@
     <attribute name="wsdl"/>
     <attribute name="package"/>
     <attribute name="outputDir"/>
-    <attribute name="jbossHome"/>
+    <attribute name="endorsedDir"/>
     <attribute name="log4jConf"/>
     <attribute name="loggingDir"/>
 
@@ -57,7 +57,7 @@
         target="2.2"
         fork="true"
       >
-        <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+        <jvmarg line="-Djava.endorsed.dirs=@{endorsedDir}"/>
         <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
         <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
       </wsconsume>

Modified: stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml	2011-04-18 16:48:31 UTC (rev 14158)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml	2011-04-18 20:44:53 UTC (rev 14159)
@@ -19,7 +19,7 @@
     <wsprovide-macro
       sei="org.jboss.test.ws.jaxws.jbws2960.AddNumbersImpl"
       destdir="jaxws/jbws2960"
-      jbossHome="${jboss.home}"
+      endorsedDir="${endorsed.dir}"
       outputDir="${tests.output.dir}"
       log4jConf="${log4j.conf}"
       loggingDir="${log4j.output.dir}"
@@ -32,7 +32,7 @@
 
     <attribute name="sei"/>
     <attribute name="destDir"/>
-    <attribute name="jbossHome"/>
+    <attribute name="endorsedDir"/>
     <attribute name="outputDir"/>
     <attribute name="log4jConf"/>
     <attribute name="loggingDir"/>
@@ -48,7 +48,7 @@
         destdir="@{outputDir}/test-classes/@{destDir}"
         resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}"
       >
-        <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+        <jvmarg line="-Djava.endorsed.dirs=@{endorsedDir}"/>
         <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
         <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
       </wsprovide>