You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/09/30 21:15:17 UTC
svn commit: r820397 - in /cxf/branches/2.2.x-fixes: ./ systests/
systests/aegis/ systests/databinding/ systests/databinding/src/
systests/databinding/src/test/ systests/databinding/src/test/generated/
systests/databinding/src/test/generated/org/ systes...
Author: dkulp
Date: Wed Sep 30 19:15:14 2009
New Revision: 820397
URL: http://svn.apache.org/viewvc?rev=820397&view=rev
Log:
Merged revisions 820391,820393 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r820391 | dkulp | 2009-09-30 15:04:45 -0400 (Wed, 30 Sep 2009) | 2 lines
Rename systests/aegis to systests/databinding and move the other databinding related systests into it
........
r820393 | dkulp | 2009-09-30 15:07:22 -0400 (Wed, 30 Sep 2009) | 2 lines
Forgot a file
........
Added:
cxf/branches/2.2.x-fixes/systests/databinding/ (props changed)
- copied from r820393, cxf/trunk/systests/databinding/
cxf/branches/2.2.x-fixes/systests/databinding/pom.xml
- copied unchanged from r820393, cxf/trunk/systests/databinding/pom.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/
- copied from r820393, cxf/trunk/systests/databinding/src/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/
- copied from r820393, cxf/trunk/systests/databinding/src/test/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/generated/
- copied from r820393, cxf/trunk/systests/databinding/src/test/generated/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/generated/org/
- copied from r820393, cxf/trunk/systests/databinding/src/test/generated/org/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/generated/org/apache/
- copied from r820393, cxf/trunk/systests/databinding/src/test/generated/org/apache/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/generated/org/apache/cxf/
- copied from r820393, cxf/trunk/systests/databinding/src/test/generated/org/apache/cxf/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/generated/org/apache/cxf/systest/
- copied from r820393, cxf/trunk/systests/databinding/src/test/generated/org/apache/cxf/systest/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/generated/org/apache/cxf/systest/jaxb/
- copied from r820393, cxf/trunk/systests/databinding/src/test/generated/org/apache/cxf/systest/jaxb/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/generated/org/apache/cxf/systest/jaxb/service/
- copied from r820393, cxf/trunk/systests/databinding/src/test/generated/org/apache/cxf/systest/jaxb/service/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/generated/org/apache/cxf/systest/jaxb/service/TestServiceException.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/generated/org/apache/cxf/systest/jaxb/service/TestServiceException.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AttributeBean.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AttributeBean.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/BeanWithCharacter.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/BeanWithCharacter.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/ServerPasswordCallback.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/ServerPasswordCallback.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsService.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsService.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/Team.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/Team.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/bean/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/bean/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/bean/AnInterface.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/bean/AnInterface.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/bean/Item.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/bean/Item.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/DataHandlerBean.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/DataHandlerBean.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTest.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestImpl.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestImpl.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/ExtendedWidget.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/ExtendedWidget.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/ExtendedWidgetWithMime.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/ExtendedWidgetWithMime.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/Widget.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/Widget.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/jaxb.index
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/jaxb.index
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/service/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/service/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/service/TestService.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/service/TestService.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/service/TestServiceImpl.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/service/TestServiceImpl.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/util/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/util/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/util/ClassArrayFactoryBean.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/util/ClassArrayFactoryBean.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/
- copied from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/GreeterImpl.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/GreeterImpl.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/Server.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/Server.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ServerNoWsdl.java
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ServerNoWsdl.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf_no_wsdl.xml
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf_no_wsdl.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/
- copied from r820393, cxf/trunk/systests/databinding/src/test/resources/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/extrajaxbclass.xml
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/resources/extrajaxbclass.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/webapp/
- copied from r820393, cxf/trunk/systests/databinding/src/test/resources/webapp/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/webapp/WEB-INF/
- copied from r820393, cxf/trunk/systests/databinding/src/test/resources/webapp/WEB-INF/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/webapp/WEB-INF/web.xml
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/resources/webapp/WEB-INF/web.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/wsdl_systest_databinding/
- copied from r820393, cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/wsdl_systest_databinding/xmlbeans/
- copied from r820393, cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/xmlbeans/
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/wsdl_systest_databinding/xmlbeans/hello_world.wsdl
- copied unchanged from r820393, cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/xmlbeans/hello_world.wsdl
Removed:
cxf/branches/2.2.x-fixes/systests/aegis/
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/generated/
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxb/
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/xmlbeans/
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/resources/extrajaxbclass.xml
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/resources/wsdl_systest/xmlbeans/
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/systests/pom.xml
cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:820391-820393
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange: cxf/branches/2.2.x-fixes/systests/databinding/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 30 19:15:14 2009
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+eclipse-classes
+.settings
+.classpath
+.project
+.wtpmodules
+
Modified: cxf/branches/2.2.x-fixes/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/pom.xml?rev=820397&r1=820396&r2=820397&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/pom.xml Wed Sep 30 19:15:14 2009
@@ -35,7 +35,7 @@
<module>uncategorized</module>
<module>transports</module>
<module>jaxws</module>
- <module>aegis</module>
+ <module>databinding</module>
<module>jaxrs</module>
<module>ws-specs</module>
</modules>
Modified: cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml?rev=820397&r1=820396&r2=820397&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml Wed Sep 30 19:15:14 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>