Author: dkulp
Date: Sat Sep 5 17:09:59 2009
New Revision: 811680
URL: http://svn.apache.org/viewvc?rev=811680&view=rev
Log:
Add some structure to start moving some more systests
Added:
cxf/trunk/systests/jaxws/
cxf/trunk/systests/jaxws/pom.xml
- copied, changed from r811679, cxf/trunk/systests/uncategorized/pom.xml
cxf/trunk/systests/jaxws/src/
cxf/trunk/systests/jaxws/src/test/
cxf/trunk/systests/jaxws/src/test/java/
cxf/trunk/systests/jaxws/src/test/java/org/
cxf/trunk/systests/jaxws/src/test/java/org/apache/
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/
cxf/trunk/systests/jaxws/src/test/resources/
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/
cxf/trunk/systests/transports/
cxf/trunk/systests/transports/pom.xml
- copied, changed from r811679, cxf/trunk/systests/uncategorized/pom.xml
cxf/trunk/systests/transports/src/
cxf/trunk/systests/transports/src/test/
cxf/trunk/systests/transports/src/test/java/
cxf/trunk/systests/transports/src/test/java/org/
cxf/trunk/systests/transports/src/test/java/org/apache/
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/
cxf/trunk/systests/transports/src/test/resources/
cxf/trunk/systests/transports/src/test/resources/wsdl_systest_transport/
Copied: cxf/trunk/systests/jaxws/pom.xml (from r811679,
cxf/trunk/systests/uncategorized/pom.xml)
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/pom.xml?p2=cxf/trunk/systests/jaxws/pom.xml&p1=cxf/trunk/systests/uncategorized/pom.xml&r1=811679&r2=811680&rev=811680&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/pom.xml (original)
+++ cxf/trunk/systests/jaxws/pom.xml Sat Sep 5 17:09:59 2009
@@ -26,62 +26,14 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-systests-uncategorized</artifactId>
- <name>Apache CXF Uncategorized System Tests</name>
+ <artifactId>cxf-systests-jaxws</artifactId>
+ <name>Apache CXF JAX-WS System Tests</name>
<version>2.3.0-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/cxf/trunk/systests/uncategorized</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/systests/uncategorized</developerConnection>
- </scm>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-test-resources</id>
- <phase>process-test-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
-
<outputDirectory>${basedir}/target/test-classes/schemaorg_apache_xmlbeans</outputDirectory>
- <resources>
- <resource>
-
<directory>${basedir}/target/generated/src/test/java/schemaorg_apache_xmlbeans</directory>
- <includes>
- <include>**/*.xsb</include>
- <include>**/*.class</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/src/test/generated</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${project.version}</version>
@@ -91,48 +43,7 @@
<phase>generate-test-sources</phase>
<configuration>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
-
<testWsdlRoot>${basedir}/src/test/resources/wsdl_systest</testWsdlRoot>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-xmlbeans-test-sources</id>
- <phase>generate-test-sources</phase>
- <configuration>
-
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
- <wsdlOptions>
- <wsdlOption>
-
<wsdl>${basedir}/src/test/resources/wsdl_systest/xmlbeans/hello_world.wsdl</wsdl>
- <extraargs>
- <extraarg>-db</extraarg>
- <extraarg>xmlbeans</extraarg>
- </extraargs>
- </wsdlOption>
- </wsdlOptions>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-corba-test-sources</id>
- <phase>generate-test-sources</phase>
- <configuration>
-
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
- <wsdlOptions>
- <wsdlOption>
-
<wsdl>${basedir}/src/test/resources/wsdl_systest/hello_world_corba.wsdl</wsdl>
- </wsdlOption>
- </wsdlOptions>
+
<testWsdlRoot>${basedir}/src/test/resources/wsdl_systest_jaxws</testWsdlRoot>
</configuration>
<goals>
<goal>wsdl2java</goal>
@@ -141,29 +52,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-corbatools-maven-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
-
<outputDir>${basedir}/target/generated/src/test/resources/wsdl_systest/type_test_corba/</outputDir>
- <wsdltoidlOptions>
- <wsdltoidlOption>
-
<wsdl>${basedir}/src/test/resources/wsdl_systest/type_test_corba/type_test_corba.wsdl</wsdl>
- <corbabinding>true</corbabinding>
- </wsdltoidlOption>
- </wsdltoidlOptions>
- </configuration>
- <goals>
- <goal>wsdl2idl</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -174,30 +62,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-xsd</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
-
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
- <xsdOptions>
- <xsdOption>
-
<xsd>${basedir}/src/test/resources/jms/testcase.xsd</xsd>
-
<bindingFile>${basedir}/src/test/resources/jms/testcase.xjb</bindingFile>
-
<catalog>${basedir}/src/test/build-resources/catalog.cat</catalog>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
Copied: cxf/trunk/systests/transports/pom.xml (from r811679,
cxf/trunk/systests/uncategorized/pom.xml)
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/pom.xml?p2=cxf/trunk/systests/transports/pom.xml&p1=cxf/trunk/systests/uncategorized/pom.xml&r1=811679&r2=811680&rev=811680&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/pom.xml (original)
+++ cxf/trunk/systests/transports/pom.xml Sat Sep 5 17:09:59 2009
@@ -26,62 +26,13 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-systests-uncategorized</artifactId>
- <name>Apache CXF Uncategorized System Tests</name>
+ <artifactId>cxf-systests-transports</artifactId>
+ <name>Apache CXF Transport System Tests</name>
<version>2.3.0-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/cxf/trunk/systests/uncategorized</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/systests/uncategorized</developerConnection>
- </scm>
<build>
<plugins>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-test-resources</id>
- <phase>process-test-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
-
<outputDirectory>${basedir}/target/test-classes/schemaorg_apache_xmlbeans</outputDirectory>
- <resources>
- <resource>
-
<directory>${basedir}/target/generated/src/test/java/schemaorg_apache_xmlbeans</directory>
- <includes>
- <include>**/*.xsb</include>
- <include>**/*.class</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/src/test/generated</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${project.version}</version>
@@ -91,7 +42,7 @@
<phase>generate-test-sources</phase>
<configuration>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
-
<testWsdlRoot>${basedir}/src/test/resources/wsdl_systest</testWsdlRoot>
+
<testWsdlRoot>${basedir}/src/test/resources/wsdl_systest_transport</testWsdlRoot>
</configuration>
<goals>
<goal>wsdl2java</goal>
@@ -100,70 +51,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-xmlbeans-test-sources</id>
- <phase>generate-test-sources</phase>
- <configuration>
-
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
- <wsdlOptions>
- <wsdlOption>
-
<wsdl>${basedir}/src/test/resources/wsdl_systest/xmlbeans/hello_world.wsdl</wsdl>
- <extraargs>
- <extraarg>-db</extraarg>
- <extraarg>xmlbeans</extraarg>
- </extraargs>
- </wsdlOption>
- </wsdlOptions>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-corba-test-sources</id>
- <phase>generate-test-sources</phase>
- <configuration>
-
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
- <wsdlOptions>
- <wsdlOption>
-
<wsdl>${basedir}/src/test/resources/wsdl_systest/hello_world_corba.wsdl</wsdl>
- </wsdlOption>
- </wsdlOptions>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-corbatools-maven-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
-
<outputDir>${basedir}/target/generated/src/test/resources/wsdl_systest/type_test_corba/</outputDir>
- <wsdltoidlOptions>
- <wsdltoidlOption>
-
<wsdl>${basedir}/src/test/resources/wsdl_systest/type_test_corba/type_test_corba.wsdl</wsdl>
- <corbabinding>true</corbabinding>
- </wsdltoidlOption>
- </wsdltoidlOptions>
- </configuration>
- <goals>
- <goal>wsdl2idl</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -174,30 +61,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-xsd</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
-
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
- <xsdOptions>
- <xsdOption>
-
<xsd>${basedir}/src/test/resources/jms/testcase.xsd</xsd>
-
<bindingFile>${basedir}/src/test/resources/jms/testcase.xjb</bindingFile>
-
<catalog>${basedir}/src/test/build-resources/catalog.cat</catalog>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>