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

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2011-03-11 08:02:05 -0500 (Fri, 11 Mar 2011)
New Revision: 13887

Modified:
   stack/native/trunk/modules/testsuite/native-tests/pom.xml
   stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml
   stack/native/trunk/modules/testsuite/pom.xml
Log:
removing JAXRPC test suite hacks

Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/pom.xml	2011-03-11 11:34:13 UTC (rev 13886)
+++ stack/native/trunk/modules/testsuite/native-tests/pom.xml	2011-03-11 13:02:05 UTC (rev 13887)
@@ -76,7 +76,6 @@
                     <property name="jboss.bind.address" value="${jboss.bind.address}" />
                     <property name="log4j.output.dir" value="${log4j.output.dir}"/>
                     <property name="jboss.home" value="${jboss.home}"/>
-                    <property name="jaxrpc.enabled" value="${jaxrpc.enabled}"/>
                     <ant antfile="scripts/antrun-wstools.xml" target="wstools" />
                   </tasks>
                 </configuration>

Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml	2011-03-11 11:34:13 UTC (rev 13886)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml	2011-03-11 13:02:05 UTC (rev 13887)
@@ -13,18 +13,13 @@
   <!-- ================================================================== -->
 
   <target name="wstools" description="Generate the JAX-RPC artifacts.">
-    <condition property="generate.jaxrpc.artifacts" value="true">
-      <and>
-        <equals arg1="${jaxrpc.enabled}" arg2="true"/>
-      </and>
-    </condition>
     <antcall target="generate-sources"/>
     <antcall target="compile-sources"/>
     <antcall target="copy-resources"/>
   </target>
 
   <!-- Generate JAX-RPC artifacts -->
-  <target name="generate-sources" if="generate.jaxrpc.artifacts">
+  <target name="generate-sources">
 
     <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
       <classpath>
@@ -53,8 +48,7 @@
 
   </target>
 
-  <!-- Copy generated resources -->
-  <target name="compile-sources" if="generate.jaxrpc.artifacts">
+  <target name="compile-sources">
 
     <mkdir dir="${tests.output.dir}/wstools/java"/>
     <move todir="${tests.output.dir}/wstools/java">
@@ -80,8 +74,7 @@
     </javac>
   </target>
 
-  <!-- Copy generated resources -->
-  <target name="copy-resources" if="generate.jaxrpc.artifacts">
+  <target name="copy-resources">
 
     <copy todir="${tests.output.dir}/test-resources">
       <fileset dir="${tests.output.dir}/wstools/resources">
@@ -98,7 +91,6 @@
     </copy>
   </target>
 
-  <!-- macro-wstools -->
   <macrodef name="macro-wstools">
     <attribute name="dest"/>
     <attribute name="config"/>

Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml	2011-03-11 11:34:13 UTC (rev 13886)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-03-11 13:02:05 UTC (rev 13887)
@@ -406,7 +406,6 @@
         <jboss.version>6.0.0.Final</jboss.version>
         <jbossws.integration.target>jboss600</jbossws.integration.target>
         <endorsed.dirs>${jboss600.home}/lib/endorsed</endorsed.dirs>
-        <jaxrpc.enabled>true</jaxrpc.enabled>
       </properties>
       <dependencies>
         <dependency>
@@ -543,7 +542,6 @@
         <jboss.version>6.0.1-SNAPSHOT</jboss.version>
         <jbossws.integration.target>jboss601</jbossws.integration.target>
         <endorsed.dirs>${jboss601.home}/lib/endorsed</endorsed.dirs>
-        <jaxrpc.enabled>true</jaxrpc.enabled>
       </properties>
       <dependencies>
         <dependency>
@@ -661,7 +659,6 @@
         <jboss.version>7.0.0.Alpha2-SNAPSHOT</jboss.version>
         <jbossws.integration.target>jboss700</jbossws.integration.target>
         <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
-        <jaxrpc.enabled>true</jaxrpc.enabled>
       </properties>
       <dependencies>
         <dependency>