cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r820391 - in /cxf/trunk/systests: aegis/ databinding/ databinding/src/test/generated/ databinding/src/test/java/org/apache/cxf/systest/jaxb/ databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ databinding/src/test/resources/ databind...
Date Wed, 30 Sep 2009 19:04:46 GMT
Author: dkulp
Date: Wed Sep 30 19:04:45 2009
New Revision: 820391

URL: http://svn.apache.org/viewvc?rev=820391&view=rev
Log:
Rename systests/aegis to systests/databinding and move the other databinding related systests
into it

Added:
    cxf/trunk/systests/databinding/
      - copied from r820268, cxf/trunk/systests/aegis/
    cxf/trunk/systests/databinding/src/test/generated/
      - copied from r820268, cxf/trunk/systests/uncategorized/src/test/generated/
    cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/
      - copied from r820268, cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxb/
    cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/
      - copied from r820268, cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/xmlbeans/
    cxf/trunk/systests/databinding/src/test/resources/extrajaxbclass.xml
      - copied unchanged from r820268, cxf/trunk/systests/uncategorized/src/test/resources/extrajaxbclass.xml
    cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/
    cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/xmlbeans/
      - copied from r820268, cxf/trunk/systests/uncategorized/src/test/resources/wsdl_systest/xmlbeans/
Removed:
    cxf/trunk/systests/aegis/
    cxf/trunk/systests/uncategorized/src/test/generated/
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxb/
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/xmlbeans/
    cxf/trunk/systests/uncategorized/src/test/resources/extrajaxbclass.xml
    cxf/trunk/systests/uncategorized/src/test/resources/wsdl_systest/xmlbeans/
Modified:
    cxf/trunk/systests/databinding/pom.xml
    cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java
    cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml
    cxf/trunk/systests/uncategorized/pom.xml

Modified: cxf/trunk/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/pom.xml?rev=820391&r1=820268&r2=820391&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/pom.xml (original)
+++ cxf/trunk/systests/databinding/pom.xml Wed Sep 30 19:04:45 2009
@@ -26,13 +26,13 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.systests</groupId>
-    <artifactId>cxf-systests-aegis</artifactId>
-    <name>Apache CXF Aegis System Tests</name>
+    <artifactId>cxf-systests-databinding</artifactId>
+    <name>Apache CXF Databinding 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/aegis</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/systests/aegis</developerConnection>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/cxf/trunk/systests/databinding</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/systests/databinding</developerConnection>
     </scm>
     <build>
         <plugins>
@@ -47,6 +47,75 @@
                     </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>
+                <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.apache.cxf</groupId>
+                <artifactId>cxf-codegen-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-test-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <configuration>
+                            <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+                            <testWsdlRoot>${basedir}/src/test/resources/wsdl_systest_databinding</testWsdlRoot>
+                            <wsdlOptions>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/src/test/resources/wsdl_systest_databinding/xmlbeans/hello_world.wsdl</wsdl>
+                                    <extraargs>
+                                        <extraarg>-db</extraarg>
+                                        <extraarg>xmlbeans</extraarg>
+                                    </extraargs>
+                                </wsdlOption>
+                            </wsdlOptions>
+                        </configuration>
+                        <goals>
+                            <goal>wsdl2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -177,6 +246,11 @@
              <groupId>com.sun.xml.fastinfoset</groupId>
              <artifactId>FastInfoset</artifactId>
          </dependency>
+        <dependency>
+             <groupId>org.apache.cxf</groupId>
+             <artifactId>cxf-rt-databinding-xmlbeans</artifactId>
+             <version>${project.version}</version>
+         </dependency>
 
         <dependency>
             <groupId>rhino</groupId>

Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java?rev=820391&r1=820268&r2=820391&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java
(original)
+++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java
Wed Sep 30 19:04:45 2009
@@ -60,7 +60,7 @@
         SpringBusFactory factory = new SpringBusFactory();
         Bus bus = factory.createBus("org/apache/cxf/systest/xmlbeans/cxf.xml");
         BusFactory.setDefaultBus(bus);
-        URL wsdl = this.getClass().getResource("/wsdl_systest/xmlbeans/hello_world.wsdl");
+        URL wsdl = this.getClass().getResource("/wsdl_systest_databinding/xmlbeans/hello_world.wsdl");
         assertNotNull("We should have found the WSDL here. " , wsdl);      
         
         SOAPService ss = new SOAPService(wsdl, SERVICE_NAME);
@@ -101,7 +101,7 @@
         SpringBusFactory factory = new SpringBusFactory();
         Bus bus = factory.createBus("org/apache/cxf/systest/xmlbeans/cxf_no_wsdl.xml");
         BusFactory.setDefaultBus(bus);
-        URL wsdl = this.getClass().getResource("/wsdl_systest/xmlbeans/hello_world.wsdl");
+        URL wsdl = this.getClass().getResource("/wsdl_systest_databinding/xmlbeans/hello_world.wsdl");
         assertNotNull("We should have found the WSDL here. " , wsdl);      
         
         SOAPService ss = new SOAPService(wsdl, SERVICE_NAME);

Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml?rev=820391&r1=820268&r2=820391&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml (original)
+++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml Wed
Sep 30 19:04:45 2009
@@ -39,7 +39,7 @@
     </jaxws:client>
 
     <jaxws:endpoint name="{http://apache.org/hello_world_soap_http/xmlbeans}SoapPort"
-        wsdlLocation="wsdl_systest/xmlbeans/hello_world.wsdl"
+        wsdlLocation="wsdl_systest_databinding/xmlbeans/hello_world.wsdl"
         createdFromAPI="true">
         <jaxws:properties>
             <entry key="schema-validation-enabled" value="true" />

Modified: cxf/trunk/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/pom.xml?rev=820391&r1=820390&r2=820391&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/pom.xml (original)
+++ cxf/trunk/systests/uncategorized/pom.xml Wed Sep 30 19:04:45 2009
@@ -36,70 +36,18 @@
     </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>
-                <executions>
-                    <execution>
-                        <id>generate-test-sources</id>
-                        <phase>generate-test-sources</phase>
-                        <configuration>
-                            <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
-                            <testWsdlRoot>${basedir}/src/test/resources/wsdl_systest</testWsdlRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl_systest/xmlbeans/hello_world.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-db</extraarg>
-                                        <extraarg>xmlbeans</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
+            <plugin>                                                              
                                           
+                <groupId>org.apache.cxf</groupId>                           
                                                 
+                <artifactId>cxf-codegen-plugin</artifactId>                 
                                                 
+                <version>${project.version}</version>                       
                                                 
+                <executions>                                                      
                                           
+                    <execution>                                                   
                                           
+                        <id>generate-test-sources</id>                      
                                                 
+                        <phase>generate-test-sources</phase>                
                                                 
+                        <configuration>                                           
                                           
+                            <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                       
+                            <testWsdlRoot>${basedir}/src/test/resources/wsdl_systest</testWsdlRoot>
                          
+                            <wsdlOptions>                                         
                                           
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/test/resources/wsdl_systest/hello_world_corba.wsdl</wsdl>
                                 </wsdlOption>
@@ -111,6 +59,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-corbatools-maven-plugin</artifactId>
@@ -207,11 +156,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-databinding-xmlbeans</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -411,13 +355,6 @@
         
 
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-databinding-sdo</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-acl</artifactId>
             <version>2.0.4</version>



Mime
View raw message