Author: dkulp Date: Fri Sep 11 17:25:21 2009 New Revision: 813933 URL: http://svn.apache.org/viewvc?rev=813933&view=rev Log: Merged revisions 813885 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r813885 | dkulp | 2009-09-11 11:54:39 -0400 (Fri, 11 Sep 2009) | 10 lines Merged revisions 811749 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r811749 | dkulp | 2009-09-05 22:30:57 -0400 (Sat, 05 Sep 2009) | 2 lines merge all the codegen stuff into a single configuration/execution to speed it up a bit. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml?rev=813933&r1=813932&r2=813933&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml (original) +++ cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml Fri Sep 11 17:25:21 2009 @@ -89,23 +89,6 @@ <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> @@ -114,18 +97,6 @@ <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> @@ -143,8 +114,8 @@ <version>${project.version}</version> <executions> <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> <configuration> <outputDir>${basedir}/target/generated/src/test/resources/wsdl_systest/type_test_corba/</outputDir> <wsdltoidlOptions>
