May 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r6961 - in stack/native/trunk/modules/testsuite/framework-tests: scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-08 05:59:23 -0400 (Thu, 08 May 2008) New Revision: 6961 Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml Log: [JBWS-2175] wsconsume cannot run with jaxws-api from build output Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-08 09:08:17 UTC (rev 6960) +++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-08 09:59:23 UTC (rev 6961) @@ -84,9 +84,10 @@ </goals> <configuration> <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="maven.test.classpath" refid="maven.test.classpath"/> <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="project.version" value="${project.version}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> </tasks> </configuration> Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-08 09:08:17 UTC (rev 6960) +++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-08 09:59:23 UTC (rev 6961) @@ -14,12 +14,12 @@   - <target name="wsconsume" description="Consume JAX-WS contracts"> + <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts">  <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> - <pathelement path="${maven.test.classpath}"/> + <pathelement path="${wsconsume.classpath}"/> </classpath> </taskdef> @@ -27,4 +27,22 @@ <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> </target> +  + <target name="available-jars"> + <property name="jaxws.ext.jar" value="${basedir}/../../jaxws-ext/target/jbossws-native-jaxws-ext-${project.version}.jar"/> + <available property="jaxws.ext.jar.available" file="${jaxws.ext.jar}"/> + <echo message="jaxws.ext.jar.available=${jaxws.ext.jar.available}"/> + </target> + + <target name="prepend-jars" depends="available-jars,prepend-jaxws-ext"> + <property name="wsconsume.classpath" value="${maven.test.classpath}"/> + </target> + + <target name="prepend-jaxws-ext" if="jaxws.ext.jar.available"> + <property name="wsconsume.classpath" value="${jaxws.ext.jar}:${maven.test.classpath}"/> + </target> + </project> \ No newline at end of file

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r6960 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-08 05:08:17 -0400 (Thu, 08 May 2008) New Revision: 6960 Modified: stack/cxf/trunk/build.xml Log: Use mvn clean instead of ant clean Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-05-08 09:08:07 UTC (rev 6959) +++ stack/cxf/trunk/build.xml 2008-05-08 09:08:17 UTC (rev 6960) @@ -116,19 +116,4 @@ </exec> </target> -  -  -  - - <target name="clean" description="Cleans up most generated files."> - - <echo message="*************************************"/> - <echo message="* mvn clean *"/> - <echo message="*************************************"/> - - <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="clean"/> - </exec> - </target> - </project>

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r6959 - in framework/trunk/hudson/hudson-home/jobs: AS-Tests-AS-4.2.2 and 54 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-08 05:08:07 -0400 (Thu, 08 May 2008) New Revision: 6959 Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml Log: Use mvn clean instead of ant clean Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -25,7 +25,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss421 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss421 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -25,7 +25,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss422 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss422 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -25,7 +25,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss423 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss423 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -25,7 +25,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss500 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss500 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -25,7 +25,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss500 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss500 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss422 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss422 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss423 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss423 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss500 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss500 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss501 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss501 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss422 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss422 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss423 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss423 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss500 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss500 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKCXF cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss501 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss501 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss422 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss422 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss423 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss423 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss500 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss500 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss501 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss501 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss422 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss422 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss423 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss423 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss500 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss500 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKMETRO cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss501 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss501 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss421 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss421 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss422 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss422 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss422 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss422 # # start jbossas @@ -54,7 +55,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss423 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss423 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss423 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss423 # # start jbossas @@ -54,7 +55,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss500 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss500 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss500 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss500 # # start jbossas @@ -54,7 +55,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss501 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss501 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss501 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss501 # # start jbossas @@ -54,7 +55,7 @@ # # execute tests # -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean build-bin-dist +mvn -Ptestsuite clean +ant $ENVIRONMENT build-bin-dist # # Deploy distro Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss421 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss421 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss422 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss422 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss422 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss422 # # start jbossas @@ -54,7 +55,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss423 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss423 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss423 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss423 # # start jbossas @@ -54,7 +55,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss500 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss500 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss500 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss500 # # start jbossas @@ -54,7 +55,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -26,7 +26,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss501 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss501 # # start jbossas @@ -44,7 +45,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml 2008-05-08 09:07:22 UTC (rev 6958) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml 2008-05-08 09:08:07 UTC (rev 6959) @@ -36,7 +36,8 @@ # cd $STACKNATIVE cp profiles.xml.example profiles.xml -ant $ENVIRONMENT clean deploy-jboss501 +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss501 # # start jbossas @@ -54,7 +55,7 @@ # # execute tests # -mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u #

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r6958 - in stack/native/trunk: modules/testsuite/framework-tests/scripts and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-08 05:07:22 -0400 (Thu, 08 May 2008) New Revision: 6958 Modified: stack/native/trunk/build.xml stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml Log: Use mvn clean instead of ant clean Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/build.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -117,19 +117,4 @@ </exec> </target> -  -  -  - - <target name="clean" description="Cleans up most generated files."> - - <echo message="*************************************"/> - <echo message="* mvn clean *"/> - <echo message="*************************************"/> - - <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="clean"/> - </exec> - </target> - </project> Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -19,7 +19,7 @@  <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> - <pathelement path="${maven.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -51,7 +51,7 @@ </goals> <configuration> <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="maven.test.classpath" refid="maven.test.classpath"/> <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> <property name="tests.output.dir" value="${project.build.directory}"/> <property name="project.version" value="${project.version}"/> @@ -67,7 +67,7 @@ </goals> <configuration> <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="maven.test.classpath" refid="maven.test.classpath"/> <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> <property name="tests.output.dir" value="${project.build.directory}"/> <ant antfile="scripts/antrun-wstools.xml" target="wstools"/> @@ -82,7 +82,7 @@ </goals> <configuration> <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="maven.test.classpath" refid="maven.test.classpath"/> <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> <property name="tests.output.dir" value="${project.build.directory}"/> <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -11,44 +11,43 @@ <project>  -  -  - - <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts"> - -  - <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> +  +  + + <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts"> + +  + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> <pathelement path="${wsconsume.classpath}"/> </classpath> </taskdef> - - <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> - </target> - + + <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + </target> +  - <target name="available-jars"> + <target name="available-jars"> <property name="jaxws.ext.jar" value="${basedir}/../../jaxws-ext/target/jbossws-native-jaxws-ext-${project.version}.jar"/> <available property="jaxws.ext.jar.available" file="${jaxws.ext.jar}"/> - <echo message="checking: ${jaxws.ext.jar}"/> <echo message="jaxws.ext.jar.available=${jaxws.ext.jar.available}"/> </target> - <target name="prepend-jars" depends="available-jars,prepend-jaxws-ext"> - <property name="wsconsume.classpath" value="${maven.classpath}"/> + <target name="prepend-jars" depends="available-jars,prepend-jaxws-ext"> + <property name="wsconsume.classpath" value="${maven.test.classpath}"/> </target> - <target name="prepend-jaxws-ext" if="jaxws.ext.jar.available"> - <property name="wsconsume.classpath" value="${jaxws.ext.jar}:${maven.classpath}"/> + <target name="prepend-jaxws-ext" if="jaxws.ext.jar.available"> + <property name="wsconsume.classpath" value="${jaxws.ext.jar}:${maven.test.classpath}"/> </target> </project> \ No newline at end of file Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -19,7 +19,7 @@  <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> <classpath> - <pathelement path="${maven.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -19,7 +19,7 @@  <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath> - <pathelement path="${maven.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef>

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r6957 - stack/metro/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-08 05:07:12 -0400 (Thu, 08 May 2008) New Revision: 6957 Modified: stack/metro/trunk/build.xml Log: Use mvn clean instead of ant clean Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-05-08 08:49:39 UTC (rev 6956) +++ stack/metro/trunk/build.xml 2008-05-08 09:07:12 UTC (rev 6957) @@ -116,19 +116,4 @@ </exec> </target> -  -  -  - - <target name="clean" description="Cleans up most generated files."> - - <echo message="*************************************"/> - <echo message="* mvn clean *"/> - <echo message="*************************************"/> - - <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="clean"/> - </exec> - </target> - </project>

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r6956 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools: doclit and 17 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-05-08 04:49:39 -0400 (Thu, 08 May 2008) New Revision: 6956 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java Log: Fix remaining wstools tests Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -49,21 +49,27 @@ public void testJavaToWSDL() throws IOException { - String[] args = new String[] { "-dest", "tools/globalconfig", "-config", getResourceFile("tools/config/java2wsdlglobal.xml").getPath() }; + File dir = createResourceFile("tools/globalconfig"); + dir.mkdirs(); + + String[] args = new String[] { "-dest", dir.getAbsolutePath(), "-config", getResourceFile("tools/config/java2wsdlglobal.xml").getAbsolutePath() }; WSTools tools = new WSTools(); tools.generate(args); - WSDLDefinitions wsdl = getWSDLDefinitions(createResourceFile("tools/globalconfig/wsdl/MarshallService.wsdl")); + WSDLDefinitions wsdl = getWSDLDefinitions(getResourceFile("tools/globalconfig/wsdl/MarshallService.wsdl")); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); assertNotNull(xsmodel.getNamespaceItem("http://jboss.org/types")); } public void testWSDLToJava() throws IOException, ClassNotFoundException { - String[] args = new String[] { "-dest", "tools/globalconfig", "-config", getResourceFile("tools/config/wsdl2javaglobal.xml").getPath() }; + File dir = createResourceFile("tools/globalconfig"); + dir.mkdirs(); + + String[] args = new String[] { "-dest", dir.getAbsolutePath(), "-config", getResourceFile("tools/config/wsdl2javaglobal.xml").getPath() }; WSTools tools = new WSTools(); tools.generate(args); - File file = createResourceFile("tools/globalconfig/org/jboss/test/ws/StandardJavaTypes.java"); + File file = getResourceFile("tools/globalconfig/org/jboss/test/ws/StandardJavaTypes.java"); assertTrue(file.exists()); checkGeneratedClass(file); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -46,7 +46,7 @@ public void testTrivialCase() throws Exception { Class seiClass = TrivialService.class; - String wsdlDir = "tools/"; + String wsdlDir = createResourceFile("tools/").getAbsolutePath(); String sname = "SampleService"; String wsdlPath = wsdlDir+ "/" + sname + ".wsdl"; JavaToWSDL jwsdl = new JavaToWSDL(Constants.NS_WSDL11); @@ -57,15 +57,15 @@ jwsdl.addFeature(WSToolsConstants.WSTOOLS_FEATURE_RESTRICT_TO_TARGET_NS, true); WSDLDefinitions wsdl = jwsdl.generate(seiClass); - Writer fw = IOUtils.getCharsetFileWriter(createResourceFile(wsdlPath), Constants.DEFAULT_XML_CHARSET); + Writer fw = IOUtils.getCharsetFileWriter(new File(wsdlPath), Constants.DEFAULT_XML_CHARSET); new WSDLWriter(wsdl).write(fw, Constants.DEFAULT_XML_CHARSET); fw.close(); String fixturefile = getResourceFile("tools/doc-lit/trivial/wsdl/SampleService.wsdl").getAbsolutePath(); //Validate the generated WSDL - File wsdlfix = createResourceFile(fixturefile); + File wsdlfix = new File(fixturefile); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); - File wsdlFile = createResourceFile(wsdlPath); + File wsdlFile = new File(wsdlPath); assertNotNull("Generated WSDL File exists?", wsdlFile); Element was = DOMUtils.parse(wsdlFile.toURL().openStream()); //assertEquals(exp, was); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -61,7 +61,7 @@ //Now validate the SEI String fname="HoldersServiceInterface.java"; File file1 = getResourceFile("tools/holders/java/org/jboss/test/"+ fname); - File file2 = createResourceFile("tools/org/jboss/test/" + fname); + File file2 = getResourceFile("tools/org/jboss/test/" + fname); try { @@ -83,9 +83,11 @@ WSDLDefinitions wsdl = jwsdl.generate(HoldersServiceInterface.class); //Generate the wsdl - String wsdlDir = "tools/"; - String wsdlPath = wsdlDir+ "/HolderService.wsdl"; - Writer fw = IOUtils.getCharsetFileWriter(createResourceFile(wsdlPath), Constants.DEFAULT_XML_CHARSET); + File wsdlDir = createResourceFile("tools/"); + wsdlDir.mkdirs(); + + String wsdlPath = wsdlDir.getAbsolutePath()+ "/HolderService.wsdl"; + Writer fw = IOUtils.getCharsetFileWriter(new File(wsdlPath), Constants.DEFAULT_XML_CHARSET); new WSDLWriter(wsdl).write(fw, Constants.DEFAULT_XML_CHARSET); fw.close(); @@ -94,12 +96,13 @@ try { String fixturefile = getResourceFile("tools/holders/wsdl/HolderService.wsdl").getAbsolutePath(); - File wsdlfix = createResourceFile(fixturefile); + File wsdlfix = new File(fixturefile); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); - File wsdlFile = createResourceFile(wsdlPath); + File wsdlFile = getResourceFile(wsdlPath); assertNotNull("Generated WSDL File exists?", wsdlFile); Element was = DOMUtils.parse(wsdlFile.toURL().openStream()); assertEquals(exp,was); + //Now that we have figured out that the wsdl files are well formed, //lets do the semantic wsdl validation WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); @@ -144,14 +147,15 @@ private void generateSEI(WSDLDefinitions wsdl) { - String seidir = "tools"; + File seidir = createResourceFile("tools"); + seidir.mkdirs(); WSDLToJavaIntf wsdljava = new WSDLToJava(); //Generate the SEI try { wsdljava.setTypeMapping(new LiteralTypeMapping()); - wsdljava.generateSEI(wsdl, createResourceFile(seidir)); + wsdljava.generateSEI(wsdl, seidir); } catch (Exception e) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -42,7 +42,7 @@ public void testWebServicesAppend() throws Exception { // create output dir - File resourceDir = createResourceFile("tools/jbws1090"); + File resourceDir = createResourceFile("tools/jbws1090"); resourceDir.mkdirs(); // copy webservices.xml fixture to output folder Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -38,23 +38,23 @@ { public final void testPortTypePort() throws Exception { - String resourceDir = createResourceFile("tools/jbws1253").getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1253"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1253"); + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/myporttype-mapping.xml", toolsDir + "/myporttype-mapping.xml"); + mappingValidator.validate(resourceDir.getAbsolutePath() + "/myporttype-mapping.xml", toolsDir + "/myporttype-mapping.xml"); - File expSEI = createResourceFile(resourceDir + "/My.java"); - File wasSEI = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1253/My.java"); + File expSEI = getResourceFile(resourceDir + "/My.java"); + File wasSEI = getResourceFile(toolsDir + "/org/jboss/test/ws/jbws1253/My.java"); JBossSourceComparator sc = new JBossSourceComparator(expSEI, wasSEI); sc.validate(); sc.validateImports(); - File expService = createResourceFile(resourceDir + "/TestSEIService.java"); - File wasService = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1253/TestSEIService.java"); + File expService = new File(resourceDir.getAbsolutePath() + "/TestSEIService.java"); + File wasService = new File(toolsDir + "/org/jboss/test/ws/jbws1253/TestSEIService.java"); sc = new JBossSourceComparator(expService, wasService); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -122,13 +122,12 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1450/scenario_" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1450/scenario_" + scenario); + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -47,13 +47,15 @@ */ public void testGenerate() throws Exception { - String resourceDir = createResourceFile("tools/jbws1453").getAbsolutePath(); - String toolsDir = resourceDir; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1453"); + resourceDir.mkdirs(); + + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -74,7 +76,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1453"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1453"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -61,13 +61,12 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1534/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1534/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1534/" + scenario); + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -88,7 +87,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1534"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1534"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -49,13 +49,14 @@ */ public void testGenerate() throws Exception { - String resourceDir = createResourceFile("tools/jbws1607").getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1607"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1607"); + String toolsDir = resourceDir.getAbsolutePath(); + + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -76,7 +77,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1607"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1607"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -48,13 +48,14 @@ */ public void testGenerate() throws Exception { - String resourceDir = createResourceFile("tools/jbws1627").getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1627"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1627"); + String toolsDir = resourceDir.getAbsolutePath(); + + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -75,7 +76,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1627"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -48,12 +48,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1691/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1691/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1691/" + scenario); + resourceDir.mkdirs(); + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -74,7 +75,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1691"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1691"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -59,12 +59,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1698/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1698/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1698/" + scenario); + String toolsDir = resourceDir.getAbsolutePath(); + + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -85,7 +86,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1698"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1698"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -51,12 +51,14 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1723/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1723/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1723/" + scenario); + resourceDir.mkdirs(); + + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -77,7 +79,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1723"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1723"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -51,12 +51,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1801/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1801/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1801/" + scenario); + String toolsDir = resourceDir.getAbsolutePath(); + + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -77,7 +78,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1801"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1801"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -47,12 +47,14 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1873/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1873/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1873/" + scenario); + resourceDir.mkdirs(); + + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -73,7 +75,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1873"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -47,12 +47,12 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws2019/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws2019/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws2019/" + scenario); + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -73,7 +73,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws2019"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2019"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -75,12 +75,14 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws429/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws429/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws429/" + scenario); + resourceDir.mkdirs(); + + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -101,7 +103,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws429"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws429"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -35,9 +35,17 @@ */ public class JBWS810TestCase extends JBossWSTest { - private String resourceDir = createResourceFile("tools/jbws810").getAbsolutePath(); - private String toolsDir = resourceDir; //"tools/jbws810"; + private File resourceDir; + private String toolsDir; + + protected void setUp() throws Exception + { + resourceDir = createResourceFile("tools/jbws810"); + resourceDir.mkdirs(); + toolsDir = resourceDir.getAbsolutePath(); + } + public void testDocument() throws Exception { runTest("document"); @@ -51,7 +59,7 @@ public void runTest(final String type) throws Exception { String testToolsDir = toolsDir + "/" + type; - String testResourceDir = resourceDir + "/" + type; + String testResourceDir = resourceDir.getAbsolutePath() + "/" + type; String[] args = new String[] { "-dest", testToolsDir, "-config", testResourceDir + "/wstools-config.xml" }; new WSTools().generate(args); @@ -64,8 +72,8 @@ private void compareSource(final String type, final String fileName) throws Exception { - File expected = createResourceFile(resourceDir + "/" + type + "/" + fileName); - File generated = createResourceFile(toolsDir + "/" + type + "/org/jboss/test/ws/jbws810/" + fileName); + File expected = new File(resourceDir + "/" + type + "/" + fileName); + File generated = new File(toolsDir + "/" + type + "/org/jboss/test/ws/jbws810/" + fileName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -34,7 +34,7 @@ */ public class ScriptTestCase extends JBossWSTest { - private String TOOLS_CONFIG = getResourceFile("tools/scripts/wstools-config.xml").getPath(); + private String TOOLS_CONFIG = getResourceFile("tools/scripts/wstools-config.xml").getAbsolutePath(); private String JBOSS_HOME; private String JDK_HOME; @@ -58,17 +58,17 @@ fail("This test has not been verified on windows"); } - // use absolute path for the output to be re-usable - String absToolsConfig = createResourceFile(TOOLS_CONFIG).getAbsolutePath(); - String absOutput = createResourceFile("wstools/java").getAbsolutePath(); + // use absolute path for the output to be re-usable + File dest = createResourceFile("wstools/java"); + dest.mkdirs(); - String command = JBOSS_HOME + "/bin/wstools.sh -config " + TOOLS_CONFIG + " -dest wstools/java"; + String command = JBOSS_HOME + "/bin/wstools.sh -config " + TOOLS_CONFIG + " -dest "+ dest.getAbsolutePath(); Process p = executeCommand(command); // check status code assertStatusCode(p, "wstools"); - File javaSource = createResourceFile("wstools/java/org/jboss/test/ws/jbws810/PhoneBookService.java"); + File javaSource = getResourceFile("wstools/java/org/jboss/test/ws/jbws810/PhoneBookService.java"); assertTrue("Service endpoint interface not generated", javaSource.exists()); }

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r6955 - in stack/native/trunk/modules/testsuite/native-tests: scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-08 04:36:21 -0400 (Thu, 08 May 2008) New Revision: 6955 Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml Log: [JBWS-2175] wsconsume cannot run with jaxws-api from build output Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-08 06:51:01 UTC (rev 6954) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-08 08:36:21 UTC (rev 6955) @@ -54,6 +54,7 @@ <property name="maven.classpath" refid="maven.test.classpath"/> <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="project.version" value="${project.version}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> </tasks> </configuration> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2008-05-08 06:51:01 UTC (rev 6954) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2008-05-08 08:36:21 UTC (rev 6955) @@ -14,12 +14,12 @@   - <target name="wsconsume" description="Consume JAX-WS contracts"> + <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts">  <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> - <pathelement path="${maven.classpath}"/> + <pathelement path="${wsconsume.classpath}"/> </classpath> </taskdef> @@ -32,4 +32,23 @@ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> </target> +  + <target name="available-jars"> + <property name="jaxws.ext.jar" value="${basedir}/../../jaxws-ext/target/jbossws-native-jaxws-ext-${project.version}.jar"/> + <available property="jaxws.ext.jar.available" file="${jaxws.ext.jar}"/> + <echo message="checking: ${jaxws.ext.jar}"/> + <echo message="jaxws.ext.jar.available=${jaxws.ext.jar.available}"/> + </target> + + <target name="prepend-jars" depends="available-jars,prepend-jaxws-ext"> + <property name="wsconsume.classpath" value="${maven.classpath}"/> + </target> + + <target name="prepend-jaxws-ext" if="jaxws.ext.jar.available"> + <property name="wsconsume.classpath" value="${jaxws.ext.jar}:${maven.classpath}"/> + </target> + </project> \ No newline at end of file

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r6954 - in stack/native/trunk/modules/testsuite: native-tests and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-08 02:51:01 -0400 (Thu, 08 May 2008) New Revision: 6954 Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/pom.xml Log: Move test preparation to profile 'noprepare' Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-07 20:39:26 UTC (rev 6953) +++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-08 06:51:01 UTC (rev 6954) @@ -32,61 +32,6 @@ </filesets> </configuration> </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <classifier>testsuite</classifier> - <type>zip</type> - </artifactItem> - </artifactItems> - <outputDirectory>src/test</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>wsconsume</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> - </tasks> - </configuration> - </execution> - <execution> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <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"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -94,6 +39,78 @@ <profiles>  + <profile> + <id>noprepare</id> + <activation> + <property> + <name>!noprepare</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <classifier>testsuite</classifier> + <type>zip</type> + </artifactItem> + </artifactItems> + <outputDirectory>src/test</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>wsconsume</id> + <phase>generate-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> + </tasks> + </configuration> + </execution> + <execution> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}"/> + <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"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + +  Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-07 20:39:26 UTC (rev 6953) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-08 06:51:01 UTC (rev 6954) @@ -24,83 +24,94 @@ </dependency> </dependencies> -  - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> -  - <execution> - <id>build-jars</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <ant antfile="src/scripts/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> - <ant antfile="src/scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> - <ant antfile="src/scripts/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="src/scripts/build-samples-jaxws.xml" target="build-samples-jaxws"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -  <profiles>  + <profile> + <id>noprepare</id> + <activation> + <property> + <name>!noprepare</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>wsconsume</id> + <phase>generate-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> + </tasks> + </configuration> + </execution> + <execution> + <id>wstools</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="scripts/antrun-wstools.xml" target="wstools"/> + </tasks> + </configuration> + </execution> + <execution> + <id>wsprovide</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/> + </tasks> + </configuration> + </execution> + <execution> + <id>build-jars</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <ant antfile="src/scripts/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> + <ant antfile="src/scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> + <ant antfile="src/scripts/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="src/scripts/build-samples-jaxws.xml" target="build-samples-jaxws"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + +

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r6953 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools: jbws1090 and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-05-07 16:39:26 -0400 (Wed, 07 May 2008) New Revision: 6953 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java Log: Additional tools test fixes ;) Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java 2008-05-07 20:14:37 UTC (rev 6952) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java 2008-05-07 20:39:26 UTC (rev 6953) @@ -202,9 +202,9 @@ protected void validateXML(String fixtureFile, String genFile) throws Exception { - File wsdlfix = createResourceFile(fixtureFile); + File wsdlfix = new File(fixtureFile); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); - File wsdlFile = createResourceFile(genFile); + File wsdlFile = new File(genFile); assertNotNull("Generated WSDL File exists?", wsdlFile); Element was = DOMUtils.parse(wsdlFile.toURL().openStream()); assertEquals(exp, was); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2008-05-07 20:14:37 UTC (rev 6952) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2008-05-07 20:39:26 UTC (rev 6953) @@ -42,11 +42,12 @@ public void testWebServicesAppend() throws Exception { // create output dir - createResourceFile("tools/jbws1090").mkdirs(); + File resourceDir = createResourceFile("tools/jbws1090"); + resourceDir.mkdirs(); // copy webservices.xml fixture to output folder FileInputStream src = new FileInputStream(getResourceFile("tools/metadatafixture/webservices.xml").getPath()); - FileOutputStream dest = new FileOutputStream("tools/jbws1090/webservices.xml"); + FileOutputStream dest = new FileOutputStream(createResourceFile("tools/jbws1090/webservices.xml")); IOUtils.copyStream(dest, src); src.close(); dest.close(); @@ -56,7 +57,7 @@ new WSTools().generate(args); Element expected = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws1090/webservices.xml").getPath())); - Element was = DOMUtils.parse(new FileInputStream("tools/jbws1090/webservices.xml")); + Element was = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws1090/webservices.xml"))); assertEquals(expected, was); } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-05-07 20:14:37 UTC (rev 6952) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-05-07 20:39:26 UTC (rev 6953) @@ -79,12 +79,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1597/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1597/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1597/" + scenario); + resourceDir.mkdirs(); + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -105,7 +106,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1597"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-05-07 20:14:37 UTC (rev 6952) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-05-07 20:39:26 UTC (rev 6953) @@ -58,7 +58,7 @@ public void checkServiceEndpointInterface() throws Exception { - String out_dir = "tools/jbws-206/jbossws/" + getBase(); + String out_dir = getResourceFile("tools/jbws-206/jbossws/" + getBase()).getAbsolutePath(); String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); @@ -66,36 +66,36 @@ String sei = fixBase + "/sei/" + seiName; // Check the sei // assertExactSourceFiles(createResourceFile(sei), createResourceFile(out_dir + "/client/" + packageDir + "/" + seiName )); - assertExactSourceFiles(createResourceFile(sei), createResourceFile(out_dir + "/" + packageDir + "/" + seiName)); + assertExactSourceFiles(new File(sei), new File(out_dir + "/" + packageDir + "/" + seiName)); } public void checkServiceInterface() throws Exception { - String out_dir = "tools/jbws-206/jbossws/" + getBase(); + String out_dir = getResourceFile("tools/jbws-206/jbossws/" + getBase()).getAbsolutePath(); String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); String serviceName = getServiceName(); // Check the Service File - assertExactSourceFiles(createResourceFile(fixBase + "/service/" + serviceName + ".java"), createResourceFile(out_dir + "/" + packageDir + "/" + serviceName + ".java")); + assertExactSourceFiles(new File(fixBase + "/service/" + serviceName + ".java"), new File(out_dir + "/" + packageDir + "/" + serviceName + ".java")); //createResourceFile(out_dir + "/client/" + packageDir + "/" + serviceName + ".java" )); } public final void checkUserType(String name) throws Exception { - String out_dir = "tools/jbws-206/jbossws/" + getBase(); + String out_dir = getResourceFile("tools/jbws-206/jbossws/" + getBase()).getAbsolutePath(); String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); // Check User Types - assertExactSourceFiles(createResourceFile(fixBase + "/usertypes/" + name), createResourceFile(out_dir + "/" + packageDir + "/" + name)); + assertExactSourceFiles(new File(fixBase + "/usertypes/" + name), new File(out_dir + "/" + packageDir + "/" + name)); //createResourceFile(out_dir + "/client/" + packageDir + "/" + name )); } protected final void generate() throws Exception { - String out_dir = "tools/jbws-206/jbossws/" + getBase(); + String out_dir = getResourceFile("tools/jbws-206/jbossws/" + getBase()).getAbsolutePath(); String configloc = getResourceFile("tools/jbws-206/jbosswsConfig/" + getBase() + "/" + getBase() + "wsdl2java.xml").getAbsolutePath(); String[] args = new String[] { "-dest", out_dir, "-config", configloc };

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r6952 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools: jbws1697 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-05-07 16:14:37 -0400 (Wed, 07 May 2008) New Revision: 6952 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java Log: Fix jbws1679 tests Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-05-07 20:08:21 UTC (rev 6951) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-05-07 20:14:37 UTC (rev 6952) @@ -47,12 +47,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1278/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1278/" + scenario); + resourceDir.mkdirs(); + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -73,7 +74,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1278"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1278"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-05-07 20:08:21 UTC (rev 6951) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-05-07 20:14:37 UTC (rev 6952) @@ -64,12 +64,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1697/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1697/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1697/" + scenario); + resourceDir.mkdirs(); + String toolsDir = resourceDir.getAbsolutePath(); //"tools/jbws1697/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -90,7 +91,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1697"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1697"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) {

17 years, 11 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2008