[jbossws-commits] JBossWS SVN: r7198 - in stack/native/trunk: modules/testsuite and 4 other directories.

Author: richard.opalka(a)jboss.com Date: 2008-05-29 05:16:17 -0400 (Thu, 29 May 2008) New Revision: 7198 Added: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt stack/native/trunk/pom.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2168] reincarnate BPEL tests Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 09:08:15 UTC (rev 7197) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 09:16:17 UTC (rev 7198) @@ -44,6 +44,22 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>bpel</id> + <phase>generate-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.test.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${test.resources.directory}"/> + <!--property name="tests.resources.dir" value="${basedir}/src/test/resources"/--> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="scripts/antrun-bpel.xml" target="bpel"/> + </tasks> + </configuration> + </execution> + <execution> <id>wsconsume</id> <phase>generate-sources</phase> <goals> @@ -52,7 +68,8 @@ <configuration> <tasks> <property name="maven.test.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.resources.dir" value="${test.resources.directory}"/> + <!--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"/> @@ -68,7 +85,8 @@ <configuration> <tasks> <property name="maven.test.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.resources.dir" value="${test.resources.directory}"/> + <!--property name="tests.resources.dir" value="${basedir}/src/test/resources"/--> <property name="tests.output.dir" value="${project.build.directory}"/> <property name="jboss.bind.address" value="${jboss.bind.address}"/> <property name="java.jdk15.home" value="${java.jdk15.home}"/> @@ -85,7 +103,8 @@ <configuration> <tasks> <property name="maven.test.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.resources.dir" value="${test.resources.directory}"/> + <!--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> @@ -100,7 +119,8 @@ <configuration> <tasks> <property name="tests.output.dir" value="${project.build.directory}"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.resources.dir" value="${test.resources.directory}"/> + <!--property name="tests.resources.dir" value="${basedir}/src/test/resources"/--> <ant antfile="scripts/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> <ant antfile="scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> <ant antfile="scripts/build-jars-jaxws.xml" target="build-jars-jaxws"/> Added: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml 2008-05-29 09:16:17 UTC (rev 7198) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- BPEL --> + <!-- ================================================================== --> + + <target name="bpel" description="Generate jBPM-BPEL artifacts"> + + <property name="thirdparty.dir" value="${tests.output.dir}/../../../../target/deploy-artifacts/lib/"/> + + <!-- 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"/> + <path id="jbpm.bpel.classpath"> + <pathelement path="${maven.test.classpath}"/> + <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml --> + <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 --> + <mkdir dir="${tests.output.dir}/test-libs"/> + <zip destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello-process.zip"> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> + </zip> + + <!-- Copy the BPEL sar to tests lib directory --> + <copy file="${thirdparty.dir}/bpel.sar" tofile="${tests.output.dir}/test-libs/jbpm-bpel.sar"/> + + <!-- generate wsdl binding and service definitions for bpel processes --> + <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> + <classpath refid="jbpm.bpel.classpath"/> + </taskdef> + + <servicegen + processfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello-process.zip" + outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" + bindingfile="hello-binding-.wsdl" + servicefile="hello-service.wsdl"/> + + </target> + +</project> Property changes on: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF 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 09:08:15 UTC (rev 7197) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-29 09:16:17 UTC (rev 7198) @@ -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"/> - <!--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> @@ -104,4 +104,4 @@ </sequential> </macrodef> -</project> \ No newline at end of file +</project> 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 09:08:15 UTC (rev 7197) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2008-05-29 09:16:17 UTC (rev 7198) @@ -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"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml 2008-05-29 09:08:15 UTC (rev 7197) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml 2008-05-29 09:16:17 UTC (rev 7198) @@ -4,7 +4,7 @@ <package-namespace package="org.jboss.test.ws.jaxrpc.samples.wsbpel.hello" namespace="http://jbpm.org/examples/hello" /> </global> - <wsdl-java location="wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl/hello-service.wsdl"> + <wsdl-java location="@test.resources.directory@/../wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl/hello-service.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> -</configuration> \ No newline at end of file +</configuration> Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-29 09:08:15 UTC (rev 7197) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-29 09:16:17 UTC (rev 7198) @@ -28,9 +28,6 @@ # [JBWS-2175] wsconsume cannot run with jaxws-api from build output org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.* -# [JBWS-2168] Fix samples bpel for maven build -org/jboss/test/ws/jaxrpc/samples/wsbpel/** - # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-29 09:08:15 UTC (rev 7197) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-29 09:16:17 UTC (rev 7198) @@ -26,9 +26,6 @@ org/jboss/test/ws/jaxws/samples/jmstransport/** org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.* -# [JBWS-2168] Fix samples bpel for maven build -org/jboss/test/ws/jaxrpc/samples/wsbpel/** - # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-29 09:08:15 UTC (rev 7197) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-29 09:16:17 UTC (rev 7198) @@ -9,9 +9,6 @@ # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* -# [JBWS-2168] Fix samples bpel for maven build -org/jboss/test/ws/jaxrpc/samples/wsbpel/** - # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-29 09:08:15 UTC (rev 7197) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-29 09:16:17 UTC (rev 7198) @@ -23,9 +23,6 @@ # [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.* -# [JBWS-2168] Fix samples bpel for maven build -org/jboss/test/ws/jaxrpc/samples/wsbpel/** - # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-29 09:08:15 UTC (rev 7197) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-29 09:16:17 UTC (rev 7198) @@ -38,9 +38,6 @@ # [JBAS-5388] JBossXBRuntimeException: Missing value for the required attribute org/jboss/test/ws/jaxrpc/jbws720/** -# [JBWS-2168] Fix samples bpel for maven build -org/jboss/test/ws/jaxrpc/samples/wsbpel/** - # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-29 09:08:15 UTC (rev 7197) +++ stack/native/trunk/pom.xml 2008-05-29 09:16:17 UTC (rev 7198) @@ -53,6 +53,10 @@ <jbossws.jboss501.version>3.0.0-SNAPSHOT</jbossws.jboss501.version> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> + <commons.collections.version>3.1</commons.collections.version> + <dom4j.version>1.6.1</dom4j.version> + <jaxen.version>1.1-beta-11</jaxen.version> + <jboss.common.logging.log4j.version>2.0.4.GA</jboss.common.logging.log4j.version> <javassist.version>3.6.0.GA</javassist.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version> @@ -69,6 +73,7 @@ <wsdl4j.version>1.6.1</wsdl4j.version> <xmlsec.version>1.3.0</xmlsec.version> <xalan.version>2.7.0</xalan.version> + <jbpm.bpel.version>1.1.0.Beta5</jbpm.bpel.version> </properties> <!-- DependencyManagement --> @@ -236,6 +241,50 @@ <version>${commons.logging.version}</version> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons.collections.version}</version> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>${dom4j.version}</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>${jaxen.version}</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common-logging-log4j</artifactId> + <version>${jboss.common.logging.log4j.version}</version> + <exclusions> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>com.sun.xml.fastinfoset</groupId> <artifactId>FastInfoset</artifactId> <version>${sun.fastinfoset.version}</version> @@ -327,6 +376,12 @@ <artifactId>xmlsec</artifactId> <version>${xmlsec.version}</version> </dependency> + <dependency> + <groupId>jboss.jbpm</groupId> + <artifactId>bpel</artifactId> + <version>${jbpm.bpel.version}</version> + <type>sar</type> + </dependency> </dependencies> </dependencyManagement> @@ -429,6 +484,32 @@ <scope>provided</scope> <type>sar</type> </dependency> + <dependency> + <groupId>jboss.jbpm</groupId> + <artifactId>bpel</artifactId> + <scope>provided</scope> + <type>sar</type> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common-logging-log4j</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <!-- Plugins --> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:08:15 UTC (rev 7197) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:16:17 UTC (rev 7198) @@ -35,6 +35,11 @@ <include>*:jbossws-jboss500:jar</include> <include>*:jbossws-jboss501:jar</include> <include>*:juddi-service:sar</include> + <include>*:bpel:sar</include> + <include>*:commons-collections:jar</include> + <include>*:dom4j:jar</include> + <include>*:jaxen:jar</include> + <include>*:jboss-common-logging-log4j:jar</include> </includes> </dependencySet> <dependencySet> @@ -158,4 +163,4 @@ </fileSet> </fileSets> -</assembly> \ No newline at end of file +</assembly>