cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r546005 - in /incubator/cxf/trunk: ./ codegen-plugin/ codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ tools/javato/ tools/javato/core/ tools/javato/core/src/ tools/javato/core/src/main/ tools/javato/core/src/main/java/ tools/javat...
Date Mon, 11 Jun 2007 04:59:27 GMT
Author: mmao
Date: Sun Jun 10 21:59:25 2007
New Revision: 546005

URL: http://svn.apache.org/viewvc?view=rev&rev=546005
Log:
* Split the javato into core and tests to resolve the cycle dependencies
* Move the wsdlgen mojo into the codegen plugin


Added:
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSDLMojo.java
      - copied unchanged from r545464, incubator/cxf/trunk/wsdlgen-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSDLMojo.java
    incubator/cxf/trunk/tools/javato/core/
    incubator/cxf/trunk/tools/javato/core/pom.xml
      - copied, changed from r545465, incubator/cxf/trunk/tools/javato/pom.xml
    incubator/cxf/trunk/tools/javato/core/src/
    incubator/cxf/trunk/tools/javato/core/src/main/
      - copied from r545464, incubator/cxf/trunk/tools/javato/src/main/
    incubator/cxf/trunk/tools/javato/core/src/main/java/
      - copied from r545985, incubator/cxf/trunk/tools/javato/src/main/java/
    incubator/cxf/trunk/tools/javato/core/src/main/resources/
      - copied from r545985, incubator/cxf/trunk/tools/javato/src/main/resources/
    incubator/cxf/trunk/tools/javato/test/
    incubator/cxf/trunk/tools/javato/test/pom.xml
      - copied, changed from r545465, incubator/cxf/trunk/tools/javato/pom.xml
    incubator/cxf/trunk/tools/javato/test/src/
    incubator/cxf/trunk/tools/javato/test/src/test/
      - copied from r545464, incubator/cxf/trunk/tools/javato/src/test/
    incubator/cxf/trunk/tools/javato/test/src/test/java/
      - copied from r545985, incubator/cxf/trunk/tools/javato/src/test/java/
    incubator/cxf/trunk/tools/javato/test/src/test/resources/
      - copied from r545985, incubator/cxf/trunk/tools/javato/src/test/resources/
Removed:
    incubator/cxf/trunk/tools/javato/src/main/
    incubator/cxf/trunk/tools/javato/src/test/
    incubator/cxf/trunk/wsdlgen-plugin/
Modified:
    incubator/cxf/trunk/codegen-plugin/pom.xml
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/tools/javato/pom.xml

Modified: incubator/cxf/trunk/codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/pom.xml?view=diff&rev=546005&r1=546004&r2=546005
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/pom.xml (original)
+++ incubator/cxf/trunk/codegen-plugin/pom.xml Sun Jun 10 21:59:25 2007
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
+  licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file
   distributed with this work for additional information
   regarding copyright ownership. The ASF licenses this file
@@ -82,6 +82,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-tools-java2wsdl</artifactId>
             <version>${project.version}</version>
         </dependency>
 

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=546005&r1=546004&r2=546005
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Sun Jun 10 21:59:25 2007
@@ -132,7 +132,6 @@
         <module>api</module>
         <module>tools</module>
         <module>codegen-plugin</module>
-        <module>wsdlgen-plugin</module>
         <module>testutils</module>
         <module>rt</module>
         <module>integration</module>

Copied: incubator/cxf/trunk/tools/javato/core/pom.xml (from r545465, incubator/cxf/trunk/tools/javato/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/core/pom.xml?view=diff&rev=546005&p1=incubator/cxf/trunk/tools/javato/pom.xml&r1=545465&p2=incubator/cxf/trunk/tools/javato/core/pom.xml&r2=546005
==============================================================================
--- incubator/cxf/trunk/tools/javato/pom.xml (original)
+++ incubator/cxf/trunk/tools/javato/core/pom.xml Sun Jun 10 21:59:25 2007
@@ -22,7 +22,7 @@
     <artifactId>cxf-tools-java2wsdl</artifactId>
     <packaging>jar</packaging>
     <version>2.0-incubator-SNAPSHOT</version>
-    <name>Apache CXF Command Line Tools JavaTo</name>
+    <name>Apache CXF Command Line Tools JavaTo Core</name>
     <url>http://cwiki.apache.org/CXF</url>
 
     <parent>
@@ -85,27 +85,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${project.version}</version>
-	    <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-wsdlto-test</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-testutils</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
         </dependency>
@@ -127,46 +106,4 @@
       <url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-tools-java2wsdl</url>
   </scm>
 
-    <build>
-        <plugins>
-	    <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>
-			    <wsdlOptions>
-				<wsdlOption>
-				    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_async.wsdl</wsdl>
-				</wsdlOption>
-				<wsdlOption>
-				    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/doc_wrapped_simple.wsdl</wsdl>
-				</wsdlOption>
-				<wsdlOption>
-				     <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_doc_lit.wsdl</wsdl>
-				</wsdlOption>
-				<wsdlOption>
-				     <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_doc_wrapped_bare.wsdl</wsdl>
-				</wsdlOption>
-				<wsdlOption>
-				     <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_rpc_lit.wsdl</wsdl>
-				</wsdlOption>
-				<wsdlOption>
-				      <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_soap12.wsdl</wsdl>
-				</wsdlOption>
-				
-			    </wsdlOptions>
-			</configuration>
-			<goals>
-			    <goal>wsdl2java</goal>
-			</goals>
-		    </execution>
-		</executions>
-	    </plugin>
-       </plugins>
-    </build>
 </project>

Modified: incubator/cxf/trunk/tools/javato/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/pom.xml?view=diff&rev=546005&r1=546004&r2=546005
==============================================================================
--- incubator/cxf/trunk/tools/javato/pom.xml (original)
+++ incubator/cxf/trunk/tools/javato/pom.xml Sun Jun 10 21:59:25 2007
@@ -19,154 +19,27 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf</groupId>
-    <artifactId>cxf-tools-java2wsdl</artifactId>
-    <packaging>jar</packaging>
+    <artifactId>cxf-tools-javato</artifactId>
+    <packaging>pom</packaging>
     <version>2.0-incubator-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools JavaTo</name>
     <url>http://cwiki.apache.org/CXF</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-parent</artifactId>
+        <artifactId>cxf-tools</artifactId>
         <version>2.0-incubator-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>saaj-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${project.version}</version>
-	    <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-wsdlto-test</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-testutils</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-        </dependency>
-
-    </dependencies>
+    <modules>
+        <module>core</module>
+        <module>test</module>
+    </modules>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/javato</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/javato</developerConnection>
-      <url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-tools-java2wsdl</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto</developerConnection>
+      <url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-tools/cxf-tools-wsdlto</url>
   </scm>
 
-    <build>
-        <plugins>
-	    <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>
-			    <wsdlOptions>
-				<wsdlOption>
-				    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_async.wsdl</wsdl>
-				</wsdlOption>
-				<wsdlOption>
-				    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/doc_wrapped_simple.wsdl</wsdl>
-				</wsdlOption>
-				<wsdlOption>
-				     <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_doc_lit.wsdl</wsdl>
-				</wsdlOption>
-				<wsdlOption>
-				     <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_doc_wrapped_bare.wsdl</wsdl>
-				</wsdlOption>
-				<wsdlOption>
-				     <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_rpc_lit.wsdl</wsdl>
-				</wsdlOption>
-				<wsdlOption>
-				      <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_soap12.wsdl</wsdl>
-				</wsdlOption>
-				
-			    </wsdlOptions>
-			</configuration>
-			<goals>
-			    <goal>wsdl2java</goal>
-			</goals>
-		    </execution>
-		</executions>
-	    </plugin>
-       </plugins>
-    </build>
 </project>

Copied: incubator/cxf/trunk/tools/javato/test/pom.xml (from r545465, incubator/cxf/trunk/tools/javato/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/pom.xml?view=diff&rev=546005&p1=incubator/cxf/trunk/tools/javato/pom.xml&r1=545465&p2=incubator/cxf/trunk/tools/javato/test/pom.xml&r2=546005
==============================================================================
--- incubator/cxf/trunk/tools/javato/pom.xml (original)
+++ incubator/cxf/trunk/tools/javato/test/pom.xml Sun Jun 10 21:59:25 2007
@@ -19,10 +19,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf</groupId>
-    <artifactId>cxf-tools-java2wsdl</artifactId>
+    <artifactId>cxf-tools-java2wsdl-test</artifactId>
     <packaging>jar</packaging>
     <version>2.0-incubator-SNAPSHOT</version>
-    <name>Apache CXF Command Line Tools JavaTo</name>
+    <name>Apache CXF Command Line Tools JavaTo Test</name>
     <url>http://cwiki.apache.org/CXF</url>
 
     <parent>
@@ -96,6 +96,13 @@
             <artifactId>cxf-tools-wsdlto-test</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-tools-java2wsdl</artifactId>
+            <version>${project.version}</version>
+	    <scope>test</scope>
         </dependency>
 
         <dependency>



Mime
View raw message