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

Author: richard.opalka(a)jboss.com Date: 2009-12-17 06:14:51 -0500 (Thu, 17 Dec 2009) New Revision: 11311 Removed: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsbpel/ 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/test-excludes-jboss501.txt stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt Log: [JBWS-2217] removing test case Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2009-12-16 18:40:07 UTC (rev 11310) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2009-12-17 11:14:51 UTC (rev 11311) @@ -1,10 +1,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <name>JBoss Web Services - Stack Native Specific Tests</name> <artifactId>jbossws-native-specific-tests</artifactId> <packaging>jar</packaging> - + <!-- Parent --> <parent> <groupId>org.jboss.ws.native</groupId> @@ -21,25 +21,12 @@ <version>1.4</version> <scope>test</scope> </dependency> - <dependency> - <groupId>jboss.jbpm</groupId> - <artifactId>bpel</artifactId> - <version>1.1.0.Beta5</version> - <scope>test</scope> - <type>sar</type> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-common-logging-log4j</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> - + <!-- Profiles --> <profiles> - - <!-- + + <!-- Name: noprepare Descr: Skip test preparation with -Dnoprepare --> @@ -53,44 +40,9 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>bpel-artifacts</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-bpel-artifacts.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <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> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <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-bpel.xml" target="bpel" /> - </tasks> - </configuration> - </execution> - <execution> <id>wsconsume</id> <phase>generate-sources</phase> <goals> Deleted: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml 2009-12-16 18:40:07 UTC (rev 11310) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml 2009-12-17 11:14:51 UTC (rev 11311) @@ -1,56 +0,0 @@ -<?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. --> -<!-- ============================================================ --> - -<project> - - <!-- ================================================================== --> - <!-- BPEL --> - <!-- ================================================================== --> - - <target name="bpel" description="Generate jBPM-BPEL artifacts"> - - <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> - - <!-- 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" /> - </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> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2009-12-16 18:40:07 UTC (rev 11310) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2009-12-17 11:14:51 UTC (rev 11311) @@ -41,7 +41,6 @@ <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/wssecurity/WEB-INF" config="jaxrpc/samples/wssecurity/wstools-config.xml"/> </target> Deleted: stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml 2009-12-16 18:40:07 UTC (rev 11310) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml 2009-12-17 11:14:51 UTC (rev 11311) @@ -1,22 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>bpel-artifacts</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - <dependencySet> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>test</scope> - <unpack>false</unpack> - <includes> - <include>*:bpel:sar</include> - </includes> - </dependencySet> - </dependencySets> - -</assembly> 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 2009-12-16 18:40:07 UTC (rev 11310) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2009-12-17 11:14:51 UTC (rev 11311) @@ -630,37 +630,7 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- 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"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="webservices.xml"/> - <include name="classes/bpel-application.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsbpel/hello/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </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"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-12-16 18:40:07 UTC (rev 11310) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-12-17 11:14:51 UTC (rev 11311) @@ -4,9 +4,6 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -# [JBWS-2217] Fix BPEL jaxrpc samples -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* - # [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails org/jboss/test/ws/jaxws/jbws2718/** Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-12-16 18:40:07 UTC (rev 11310) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-12-17 11:14:51 UTC (rev 11311) @@ -4,9 +4,6 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -# [JBWS-2217] Fix BPEL jaxrpc samples -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* - # [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails org/jboss/test/ws/jaxws/jbws2718/** Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-12-16 18:40:07 UTC (rev 11310) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-12-17 11:14:51 UTC (rev 11311) @@ -4,9 +4,6 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -# [JBWS-2217] Fix BPEL jaxrpc samples -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* - # [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails org/jboss/test/ws/jaxws/jbws2718/** Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2009-12-16 18:40:07 UTC (rev 11310) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2009-12-17 11:14:51 UTC (rev 11311) @@ -4,9 +4,6 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -# [JBWS-2217] Fix BPEL jaxrpc samples -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* - # [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails org/jboss/test/ws/jaxws/jbws2718/**