Author: jim.ma Date: 2009-09-30 04:11:08 -0400 (Wed, 30 Sep 2009) New Revision: 10799 Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1666/ Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml Log: [JBWS-2740]:Removed the jbws1666 test from native specific testsuite and enabled it in framework test Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:08:32 UTC (rev 10798) +++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:11:08 UTC (rev 10799) @@ -13,6 +13,10 @@ <relativePath>../pom.xml</relativePath> </parent> + <properties> + <stack.name>native</stack.name> + </properties> + <!-- Dependencies --> <dependencies> <dependency> @@ -82,7 +86,48 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>filter-test</id> + <!--This is for filter the stack name in the test--> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>target/tmp</outputDirectory> + <resources> + <resource> + <directory>src/test/java/org/jboss/test/ws/jaxws/jbws1666</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + + <execution> + <id>copy-back-test</id> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <overwrite>true</overwrite> + <outputDirectory>src/test/java/org/jboss/test/ws/jaxws/jbws1666</outputDirectory> + <resources> + <resource> + <directory>target/tmp</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-09-30 08:08:32 UTC (rev 10798) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-09-30 08:11:08 UTC (rev 10799) @@ -224,13 +224,6 @@ <include name="wsdl/attack-service.wsdl"/> </webinf> </war> - - <!-- jaxws-jbws1666 --> - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1666/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/> - </classes> - </war> <!-- jaxws-jbws1809 --> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1809.jar">