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

Author: richard.opalka(a)jboss.com Date: 2008-05-29 11:13:12 -0400 (Thu, 29 May 2008) New Revision: 7212 Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml Log: [JBWS-2168] enable BPEL samples again Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 14:42:51 UTC (rev 7211) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 15:13:12 UTC (rev 7212) @@ -47,7 +47,6 @@ </activation> <build> <plugins> - <!-- <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> @@ -55,24 +54,22 @@ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>src/main/scripts/assembly-bpel-artifacts.xml</descriptor> + <descriptor>scripts/assembly-bpel-artifacts.xml</descriptor> </descriptors> </configuration> <executions> <execution> <id>make-assembly</id> - <phase>generate-sources</phase> + <phase>validate</phase> <goals> <goal>directory-inline</goal> </goals> </execution> </executions> </plugin> - --> <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> - <!-- <execution> <id>bpel</id> <phase>generate-sources</phase> @@ -88,7 +85,6 @@ </tasks> </configuration> </execution> - --> <execution> <id>wsconsume</id> <phase>generate-sources</phase> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml 2008-05-29 14:42:51 UTC (rev 7211) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml 2008-05-29 15:13:12 UTC (rev 7212) @@ -16,30 +16,12 @@ <target name="bpel" description="Generate jBPM-BPEL artifacts"> - <property name="thirdparty.dir" value="${tests.output.dir}/bpel-artifacts/lib"/> + <property name="thirdparty.dir" value="${tests.output.dir}/bpel-artifacts"/> <!-- ensure classpath preconditions --> <fail message="File ${thirdparty.dir}/bpel.sar is not available"> <condition><not><available file="${thirdparty.dir}/bpel.sar"/></not></condition> </fail> - <!--fail message="File ${thirdparty.dir}/commons-collections.jar is not available"> - <condition><not><available file="${thirdparty.dir}/commons-collections.jar"/></not></condition> - </fail> - <fail message="File ${thirdparty.dir}/dom4j.jar is not available"> - <condition><not><available file="${thirdparty.dir}/dom4j.jar"/></not></condition> - </fail> - <fail message="File ${thirdparty.dir}/jaxen.jar is not available"> - <condition><not><available file="${thirdparty.dir}/jaxen.jar"/></not></condition> - </fail> - <fail message="File ${thirdparty.dir}/jboss-common-logging-log4j.jar is not available"> - <condition><not><available file="${thirdparty.dir}/jboss-common-logging-log4j.jar"/></not></condition> - </fail> - <fail message="File ${thirdparty.dir}/commons-logging.jar is not available"> - <condition><not><available file="${thirdparty.dir}/commons-logging.jar"/></not></condition> - </fail> - <fail message="File ${thirdparty.dir}/wsdl4j.jar is not available"> - <condition><not><available file="${thirdparty.dir}/wsdl4j.jar"/></not></condition> - </fail--> <!-- The jBPM BPEL classpath --> <unzip src="${thirdparty.dir}/bpel.sar" dest="${thirdparty.dir}/jbpm-bpel"/> @@ -49,12 +31,6 @@ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> - <!--pathelement location="${thirdparty.dir}/commons-collections.jar"/> - <pathelement location="${thirdparty.dir}/dom4j.jar"/> - <pathelement location="${thirdparty.dir}/jaxen.jar"/> - <pathelement location="${thirdparty.dir}/jboss-common-logging-log4j.jar"/> - <pathelement location="${thirdparty.dir}/commons-logging.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/--> </path> <!-- create jBPM process archives --> 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-29 14:42:51 UTC (rev 7211) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-29 15:13:12 UTC (rev 7212) @@ -43,7 +43,7 @@ <macro-wstools dest="jaxrpc/samples/secureejb/META-INF" config="jaxrpc/samples/secureejb/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> - <!--macro-wstools dest="jaxrpc/samples/wsbpel/hello/WEB-INF" config="jaxrpc/samples/wsbpel/hello/wstools-config.xml"/--> + <macro-wstools dest="jaxrpc/samples/wsbpel/hello/WEB-INF" config="jaxrpc/samples/wsbpel/hello/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/wssecurity/WEB-INF" config="jaxrpc/samples/wssecurity/wstools-config.xml"/> </target> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml 2008-05-29 14:42:51 UTC (rev 7211) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml 2008-05-29 15:13:12 UTC (rev 7212) @@ -9,19 +9,12 @@ <dependencySets> <dependencySet> - <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>test</scope> <unpack>false</unpack> <includes> <include>*:bpel:sar</include> - <include>*:commons-collections:jar</include> - <include>*:dom4j:jar</include> - <include>*:jaxen:jar</include> - <include>*:jboss-common-logging-log4j:jar</include> - <include>*:commons-logging:jar</include> - <include>*:wsdl4j:jar</include> </includes> </dependencySet> </dependencySets> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2008-05-29 14:42:51 UTC (rev 7211) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2008-05-29 15:13:12 UTC (rev 7212) @@ -633,7 +633,7 @@ </metainf> </jar> - <!-- jaxrpc-samples-wsbpel - -> + <!-- jaxrpc-samples-wsbpel --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/> @@ -661,7 +661,7 @@ <metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> <include name="jaxrpc-mapping.xml"/> </metainf> - </jar--> + </jar> <!-- jaxrpc-samples-wssecurity-sign --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">