[jbossws-commits] JBossWS SVN: r10797 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws and 2 other directories.
Author: jim.ma
Date: 2009-09-30 04:06:07 -0400 (Wed, 30 Sep 2009)
New Revision: 10797
Removed:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/jbws1666/
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
Log:
[JBWS-2740]:Remove the jbws1666 testcase in cxf-test module and put it in framework
testsuite
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-09-30
08:04:07 UTC (rev 10796)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-09-30
08:06:07 UTC (rev 10797)
@@ -67,13 +67,6 @@
<include name="cxf.xml" />
</metainf>
</jar>
-
- <!-- 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>
<!-- Please add alphabetically -->
</target>
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:04:07 UTC (rev
10796)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:06:07 UTC (rev
10797)
@@ -14,6 +14,11 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <properties>
+ <stack.name>cxf</stack.name>
+ </properties>
+
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -83,7 +88,49 @@
</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>