You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by mm...@apache.org on 2007/03/14 10:31:12 UTC

svn commit: r518082 - in /incubator/cxf/trunk: ./ distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/ rt/databinding/jaxb/ rt/databinding/jaxb/src/main/resources/wsdl/ rt/databinding/jaxb/src/main/resources/wsdl/jaxb/ rt/management/ rt/ws/pol...

Author: mmao
Date: Wed Mar 14 02:31:10 2007
New Revision: 518082

URL: http://svn.apache.org/viewvc?view=rev&rev=518082
Log:
Fix build and pom updates

* update all the pom to use tools2 
* move misc_test.xsd to rt/databinding/jaxb, since it's only used in this module
* there is a bug in common/xsd plugin when loading jaxb plugins, we temporarily add the dependency in metacode module to solve the problem.

Added:
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd
Removed:
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb/
Modified:
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/integration/jca/pom.xml
    incubator/cxf/trunk/metacode/pom.xml
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/rt/bindings/xml/pom.xml
    incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
    incubator/cxf/trunk/rt/management/pom.xml
    incubator/cxf/trunk/rt/pom.xml
    incubator/cxf/trunk/rt/ws/policy/pom.xml
    incubator/cxf/trunk/testutils/pom.xml
    incubator/cxf/trunk/tools2/common/pom.xml
    incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
    incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
    incubator/cxf/trunk/tools2/pom.xml
    incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
    incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
    incubator/cxf/trunk/tools2/xjc/dv/pom.xml
    incubator/cxf/trunk/tools2/xjc/pom.xml

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Wed Mar 14 02:31:10 2007
@@ -55,32 +55,27 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-tools-common</artifactId>
+            <artifactId>cxf-tools2-common</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-tools-validator</artifactId>
+            <artifactId>cxf-tools2-validator</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-tools-wsdl2java</artifactId>
+            <artifactId>cxf-tools2-wsdl2java</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-tools-java2wsdl</artifactId>
+            <artifactId>cxf-tools2-java2wsdl</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-tools-misctools</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-tools-xjc-dv</artifactId>
+            <artifactId>cxf-tools2-xjc-dv</artifactId>
             <version>${pom.version}</version>
         </dependency>
 

Modified: incubator/cxf/trunk/integration/jca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/integration/jca/pom.xml (original)
+++ incubator/cxf/trunk/integration/jca/pom.xml Wed Mar 14 02:31:10 2007
@@ -82,7 +82,7 @@
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-common</artifactId>
+            <artifactId>cxf-tools2-common</artifactId>
             <version>${project.version}</version>
         </dependency>
 

Modified: incubator/cxf/trunk/metacode/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/metacode/pom.xml (original)
+++ incubator/cxf/trunk/metacode/pom.xml Wed Mar 14 02:31:10 2007
@@ -142,7 +142,13 @@
                         </goals>
                     </execution>
                 </executions>
+
                 <dependencies>
+                    <dependency>
+                        <groupId>org.apache.cxf</groupId>
+                        <artifactId>cxf-tools2-xjc-dv</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>org.apache.cxf</groupId>
                         <artifactId>cxf-common-utilities</artifactId>

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Wed Mar 14 02:31:10 2007
@@ -125,13 +125,11 @@
         <module>parent</module>
         <module>common</module>
         <module>api</module>
-        <module>rt/core</module>       
         <module>metacode</module>
         <module>tools2</module>
         <module>codegen-plugin2</module>       
         <module>testutils</module>
         <module>rt</module>
-        <module>tools2/javato</module>
         <module>integration</module>
         <module>systests</module>
     </modules>

Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Wed Mar 14 02:31:10 2007
@@ -73,9 +73,9 @@
         </dependency>
         
          <dependency>
-	            <groupId>org.apache.cxf</groupId>
-	            <artifactId>cxf-tools2-common</artifactId>
-	            <version>${project.version}</version>
+	     <groupId>org.apache.cxf</groupId>
+	     <artifactId>cxf-tools2-common</artifactId>
+	     <version>${project.version}</version>
         </dependency>
        
         

Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Wed Mar 14 02:31:10 2007
@@ -55,6 +55,28 @@
                     </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>
+                            <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+                            <xsdOptions>
+                                <xsdOption>
+                                    <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
+                                </xsdOption>
+                            </xsdOptions>
+                        </configuration>
+                        <goals>
+                            <goal>xsdtojava</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

Added: incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd?view=auto&rev=518082
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd (added)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd Wed Mar 14 02:31:10 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://cxf.apache.org/jaxb_misc"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cxf.apache.org/jaxb_misc">
+    <xs:complexType name="Base64WithDefaultValueType">
+        <xs:sequence>
+            <xs:element name="EndPart" type="xs:string" />
+        </xs:sequence>
+        <xs:attribute name="AttributeWithDefaultValue" type="xs:base64Binary" default="1223" />
+    </xs:complexType>
+</schema>
\ No newline at end of file

Modified: incubator/cxf/trunk/rt/management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/rt/management/pom.xml (original)
+++ incubator/cxf/trunk/rt/management/pom.xml Wed Mar 14 02:31:10 2007
@@ -67,12 +67,6 @@
         </dependency>
         
         <dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-tools2-xjc-dv</artifactId>
-	    <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
             <scope>test</scope>

Modified: incubator/cxf/trunk/rt/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/rt/pom.xml (original)
+++ incubator/cxf/trunk/rt/pom.xml Wed Mar 14 02:31:10 2007
@@ -32,7 +32,7 @@
     </parent>
 
     <modules>
-        <module>management</module>
+        <module>core</module>
         <module>transports/local</module>
         <module>databinding/jaxb</module>
         <module>databinding/aegis</module>
@@ -46,6 +46,7 @@
         <module>ws/policy</module>
         <module>ws/addr</module>
         <module>ws/rm</module>
+        <module>management</module>
     </modules>
 
     <scm>

Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/policy/pom.xml Wed Mar 14 02:31:10 2007
@@ -116,7 +116,7 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
+                <artifactId>cxf-codegen-plugin2</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>

Modified: incubator/cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/testutils/pom.xml (original)
+++ incubator/cxf/trunk/testutils/pom.xml Wed Mar 14 02:31:10 2007
@@ -143,41 +143,6 @@
             </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>
-                            <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
-                            <xsdOptions>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
-                                </xsdOption>
-                            </xsdOptions>
-                        </configuration>
-                        <goals>
-                            <goal>xsdtojava</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-		                    <dependency>
-		                        <groupId>org.apache.cxf</groupId>
-		                        <artifactId>cxf-tools2-xjc-dv</artifactId>
-		                        <version>${project.version}</version>
-		                    </dependency>
-		                    <dependency>
-		                        <groupId>org.apache.cxf</groupId>
-		                        <artifactId>cxf-common-utilities</artifactId>
-		                        <version>${project.version}</version>
-		                    </dependency>
-                </dependencies>
-                
-            </plugin>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin2</artifactId>
                 <version>${project.version}</version>
                 <executions>
@@ -186,11 +151,6 @@
                         <phase>generate-sources</phase>
                         <configuration>
                             <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
-                            <xsdOptions>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
-                                </xsdOption>
-                            </xsdOptions>
                             <wsdlOptions>
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>

Modified: incubator/cxf/trunk/tools2/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/tools2/common/pom.xml (original)
+++ incubator/cxf/trunk/tools2/common/pom.xml Wed Mar 14 02:31:10 2007
@@ -1,20 +1,20 @@
 <!--
-  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
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
+    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
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
 <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>
@@ -26,120 +26,120 @@
     <url>http://cwiki.apache.org/CXF</url>
 
     <parent>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-parent</artifactId>
-        <version>2.0-incubator-RC-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+	<groupId>org.apache.cxf</groupId>
+	<artifactId>cxf-parent</artifactId>
+	<version>2.0-incubator-RC-SNAPSHOT</version>
+	<relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
-     <dependencies>
-            <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>velocity</groupId>
-                <artifactId>velocity</artifactId>
-            </dependency>
-    
-            <dependency>
-                <groupId>wsdl4j</groupId>
-                <artifactId>wsdl4j</artifactId>
-            </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.soap</groupId>
-                <artifactId>saaj-api</artifactId>
-            </dependency>
-    
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-activation_1.1_spec</artifactId>
-            </dependency>
+    <dependencies>
+	<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>velocity</groupId>
+	    <artifactId>velocity</artifactId>
+	</dependency>
+	
+	<dependency>
+	    <groupId>wsdl4j</groupId>
+	    <artifactId>wsdl4j</artifactId>
+	</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.soap</groupId>
+	    <artifactId>saaj-api</artifactId>
+	</dependency>
+	
+	<dependency>
+	    <groupId>org.apache.geronimo.specs</groupId>
+	    <artifactId>geronimo-activation_1.1_spec</artifactId>
+	</dependency>
 
-            <dependency>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-utilities</artifactId>
-                <version>${project.version}</version>
-            </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-api</artifactId>
-	    	<version>${project.version}</version>
-            </dependency>
-            
-        </dependencies>
+	<dependency>
+	    <groupId>org.apache.cxf</groupId>
+	    <artifactId>cxf-common-utilities</artifactId>
+	    <version>${project.version}</version>
+	</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-api</artifactId>
+	    <version>${project.version}</version>
+	</dependency>
+	
+    </dependencies>
 
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools2/common</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools2/common</developerConnection>
+	<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools2/common</connection>
+	<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools2/common</developerConnection>
     </scm>
     
     <build>
-            <plugins>
-                <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>
-                                <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
-                                <xsdOptions>
-                                    <xsdOption>
-                                        <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
-                                        <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xjb</bindingFile>
-                                        <deleteDirs>
-                                            <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
-                                        </deleteDirs>
-                                    </xsdOption>
-                                    
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
-                                    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xjb</bindingFile>
-                                    <deleteDirs>
-                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
-                                    </deleteDirs>
-                                </xsdOption>
-                                    
-                                </xsdOptions>
-                            </configuration>
-                            <goals>
-                                <goal>xsdtojava</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-     </build>    
+	<plugins>
+	    <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>
+			    <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+			    <xsdOptions>
+				<xsdOption>
+				    <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
+				    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xjb</bindingFile>
+				    <deleteDirs>
+					<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
+				    </deleteDirs>
+				</xsdOption>
+				
+				<xsdOption>
+				    <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
+				    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xjb</bindingFile>
+				    <deleteDirs>
+					<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
+				    </deleteDirs>
+				</xsdOption>
+				
+			    </xsdOptions>
+			</configuration>
+			<goals>
+			    <goal>xsdtojava</goal>
+			</goals>
+		    </execution>
+		</executions>
+	    </plugin>
+	</plugins>
+    </build>    
 
 </project>

Modified: incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml (original)
+++ incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml Wed Mar 14 02:31:10 2007
@@ -155,7 +155,7 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
+                <artifactId>cxf-codegen-plugin2</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>

Modified: incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml (original)
+++ incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml Wed Mar 14 02:31:10 2007
@@ -155,7 +155,7 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
+                <artifactId>cxf-codegen-plugin2</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>

Modified: incubator/cxf/trunk/tools2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/tools2/pom.xml (original)
+++ incubator/cxf/trunk/tools2/pom.xml Wed Mar 14 02:31:10 2007
@@ -36,6 +36,7 @@
         <module>validator</module>
         <module>wsdlto</module>
         <module>xjc</module>
+        <module>javato</module>
     </modules>
 
     <scm>

Modified: incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml (original)
+++ incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml Wed Mar 14 02:31:10 2007
@@ -22,7 +22,7 @@
     <artifactId>cxf-tools2-misctools</artifactId>
     <packaging>jar</packaging>
     <version>2.0-incubator-RC-SNAPSHOT</version>
-    <name>Apache CXF Command Line Misctools</name>
+    <name>Apache CXF Command Line Tools2 WSDLTo Misctools</name>
     <url>http://cwiki.apache.org/CXF</url>
 
     <parent>

Modified: incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml (original)
+++ incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml Wed Mar 14 02:31:10 2007
@@ -96,7 +96,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-tools-xjc-dv</artifactId>
+                        <artifactId>cxf-tools2-xjc-dv</artifactId>
                         <version>${project.version}</version>
                     </dependency>
                 </dependencies>
@@ -106,8 +106,8 @@
 
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/xjc/dv-test</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/xjc/dv-test</developerConnection>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools2/xjc/dv-test</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools2/xjc/dv-test</developerConnection>
     </scm>
 
 </project>

Modified: incubator/cxf/trunk/tools2/xjc/dv/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/tools2/xjc/dv/pom.xml (original)
+++ incubator/cxf/trunk/tools2/xjc/dv/pom.xml Wed Mar 14 02:31:10 2007
@@ -54,8 +54,8 @@
 
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/xjc/dv</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/xjc/dv</developerConnection>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools2/xjc/dv</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools2/xjc/dv</developerConnection>
     </scm>
 
 </project>

Modified: incubator/cxf/trunk/tools2/xjc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
==============================================================================
--- incubator/cxf/trunk/tools2/xjc/pom.xml (original)
+++ incubator/cxf/trunk/tools2/xjc/pom.xml Wed Mar 14 02:31:10 2007
@@ -38,8 +38,8 @@
     </modules>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/xjc</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/xjc</developerConnection>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools2/xjc</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools2/xjc</developerConnection>
     </scm>
 
 </project>



Re: svn commit: r518082 [tools2 issue ...]

Posted by Daniel Kulp <da...@iona.com>.
I've put a "hack" in place, but this needs to be looked at.

Basically, metacode requires the dv plugin.   However, tools requires 
metacode.   Thus, we have a semi-circular issue of dv being in tools 
which requires metacode which requires dv.    My hack was to add 
a "test" scope dependency on the plugin in metacode to make it build the 
plugin first.  However, that means the build won't follow the list of 
modules in the top level pom.  

dv doesn't really need to be in tools.   Since it's causing issue, it 
probably shouldn't be there.


Dan



On Wednesday 14 March 2007 11:22, Glynn, Eoghan wrote:
> Still broken for me despite an svn update & rm -r
> ~/.m2/repo/org/apache/cxf, so I've rolled back to the last known good
> revision (517791).
>
> > -----Original Message-----
> > From: James Mao [mailto:james.mao@iona.com]
> > Sent: 14 March 2007 12:38
> > To: cxf-dev@incubator.apache.org
> > Cc: cxf-commits@incubator.apache.org
> > Subject: Re: svn commit: r518082 - in /incubator/cxf/trunk:
> > ./ distribution/ integration/jca/ metacode/ rt/
> > rt/bindings/xml/ rt/databinding/jaxb/
> > rt/databinding/jaxb/src/main/resources/wsdl/
> > rt/databinding/jaxb/src/main/resources/wsdl/jaxb/
> > rt/management/ rt/ws/po
> >
> > Hi Eoghan,
> >
> > It should , can you try a mvn clean install. if it's not
> > working, Please clean all the artifacts in
> > .m2/repository/org/apache/cxf/* And try again
> >
> > Sorry to introduce so many inconvenience :(
> >
> > James.
> >
> > > James,
> > >
> > > Since your update of the pom to pick up the cxf-tools2-* as
> >
> > opposed to
> >
> > > cxf-tools-* I'm seeing a build failure as below.
> > >
> > > Have the tool2 artifacts actually been pushed up to the maven
> > > repo?
> > >
> > > /Eoghan
> > >
> > >
> > >
> > > [ERROR] BUILD ERROR
> > > [INFO]
> >
> > --------------------------------------------------------------------
> >--
> >
> > > --
> > > [INFO] Failed to resolve artifact.
> > >
> > > Missing:
> > > ----------
> > > 1) org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT
> > >
> > >   Try downloading the file manually from the project website.
> > >
> > >   Then, install it using the command:
> > >       mvn install:install-file -DgroupId=org.apache.cxf
> > > -DartifactId=cxf-tools2-xjc-dv \
> > >           -Dversion=2.0-incubator-RC-SNAPSHOT -Dpackaging=jar
> > > -Dfile=/path/to/file
> > >
> > >   Path to dependency:
> > >         1)
> > > org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSH
> > >OT 2)
> > > org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT
> > >
> > > ----------
> > > 1 required artifact is missing.
> > >
> > > for artifact:
> >
> > org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT
> >
> > > from the specified remote repositories:
> > >   central (http://repo1.maven.org/maven2)
> > >
> > >> -----Original Message-----
> > >> From: mmao@apache.org [mailto:mmao@apache.org]
> > >> Sent: 14 March 2007 09:31
> > >> To: cxf-commits@incubator.apache.org
> > >> Subject: svn commit: r518082 - in /incubator/cxf/trunk: ./
> > >> distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/
> > >> rt/databinding/jaxb/ rt/databinding/jaxb/src/main/resources/wsdl/
> > >> rt/databinding/jaxb/src/main/resources/wsdl/jaxb/
> > >> rt/management/ rt/ws/pol...
> > >>
> > >> Author: mmao
> > >> Date: Wed Mar 14 02:31:10 2007
> > >> New Revision: 518082
> > >>
> > >> URL: http://svn.apache.org/viewvc?view=rev&rev=518082
> > >> Log:
> > >> Fix build and pom updates
> > >>
> > >> * update all the pom to use tools2
> > >> * move misc_test.xsd to rt/databinding/jaxb, since it's
> >
> > only used in
> >
> > >> this module
> > >> * there is a bug in common/xsd plugin when loading jaxb
> >
> > plugins, we
> >
> > >> temporarily add the dependency in metacode module to solve the
> > >> problem.
> > >>
> > >> Added:
> >
> > incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/
> >
> >
> > incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb
> >/
> >
> > >> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> > >> l/jaxb/misc_test.xsd
> > >> Removed:
> > >>     incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb/
> > >> Modified:
> > >>     incubator/cxf/trunk/distribution/pom.xml
> > >>     incubator/cxf/trunk/integration/jca/pom.xml
> > >>     incubator/cxf/trunk/metacode/pom.xml
> > >>     incubator/cxf/trunk/pom.xml
> > >>     incubator/cxf/trunk/rt/bindings/xml/pom.xml
> > >>     incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
> > >>     incubator/cxf/trunk/rt/management/pom.xml
> > >>     incubator/cxf/trunk/rt/pom.xml
> > >>     incubator/cxf/trunk/rt/ws/policy/pom.xml
> > >>     incubator/cxf/trunk/testutils/pom.xml
> > >>     incubator/cxf/trunk/tools2/common/pom.xml
> > >>     incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
> > >>     incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
> > >>     incubator/cxf/trunk/tools2/pom.xml
> > >>     incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
> > >>     incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
> > >>     incubator/cxf/trunk/tools2/xjc/dv/pom.xml
> > >>     incubator/cxf/trunk/tools2/xjc/pom.xml
> > >>
> > >> Modified: incubator/cxf/trunk/distribution/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/
> > >> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/distribution/pom.xml (original)
> > >> +++ incubator/cxf/trunk/distribution/pom.xml Wed Mar 14
> >
> > 02:31:10 2007
> >
> > >> @@ -55,32 +55,27 @@
> > >>          </dependency>
> > >>          <dependency>
> > >>              <groupId>${pom.groupId}</groupId>
> > >> -            <artifactId>cxf-tools-common</artifactId>
> > >> +            <artifactId>cxf-tools2-common</artifactId>
> > >>              <version>${pom.version}</version>
> > >>          </dependency>
> > >>          <dependency>
> > >>              <groupId>${pom.groupId}</groupId>
> > >> -            <artifactId>cxf-tools-validator</artifactId>
> > >> +            <artifactId>cxf-tools2-validator</artifactId>
> > >>              <version>${pom.version}</version>
> > >>          </dependency>
> > >>          <dependency>
> > >>              <groupId>${pom.groupId}</groupId>
> > >> -            <artifactId>cxf-tools-wsdl2java</artifactId>
> > >> +            <artifactId>cxf-tools2-wsdl2java</artifactId>
> > >>              <version>${pom.version}</version>
> > >>          </dependency>
> > >>          <dependency>
> > >>              <groupId>${pom.groupId}</groupId>
> > >> -            <artifactId>cxf-tools-java2wsdl</artifactId>
> > >> +            <artifactId>cxf-tools2-java2wsdl</artifactId>
> > >>              <version>${pom.version}</version>
> > >>          </dependency>
> > >>          <dependency>
> > >>              <groupId>${pom.groupId}</groupId>
> > >> -            <artifactId>cxf-tools-misctools</artifactId>
> > >> -            <version>${pom.version}</version>
> > >> -        </dependency>
> > >> -        <dependency>
> > >> -            <groupId>${pom.groupId}</groupId>
> > >> -            <artifactId>cxf-tools-xjc-dv</artifactId>
> > >> +            <artifactId>cxf-tools2-xjc-dv</artifactId>
> > >>              <version>${pom.version}</version>
> > >>          </dependency>
> > >>
> > >>
> > >> Modified: incubator/cxf/trunk/integration/jca/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/j
> > >> ca/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/integration/jca/pom.xml (original)
> > >> +++ incubator/cxf/trunk/integration/jca/pom.xml Wed Mar 14
> > >> 02:31:10 2007
> > >> @@ -82,7 +82,7 @@
> > >>
> > >>          <dependency>
> > >>              <groupId>org.apache.cxf</groupId>
> > >> -            <artifactId>cxf-tools-common</artifactId>
> > >> +            <artifactId>cxf-tools2-common</artifactId>
> > >>              <version>${project.version}</version>
> > >>          </dependency>
> > >>
> > >>
> > >> Modified: incubator/cxf/trunk/metacode/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/pom.
> > >> xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/metacode/pom.xml (original)
> > >> +++ incubator/cxf/trunk/metacode/pom.xml Wed Mar 14 02:31:10 2007
> > >> @@ -142,7 +142,13 @@
> > >>                          </goals>
> > >>                      </execution>
> > >>                  </executions>
> > >> +
> > >>                  <dependencies>
> > >> +                    <dependency>
> > >> +                        <groupId>org.apache.cxf</groupId>
> > >> +                       
> > >> <artifactId>cxf-tools2-xjc-dv</artifactId> +                     
> > >>   <version>${project.version}</version> +                   
> > >> </dependency>
> > >>                      <dependency>
> > >>                          <groupId>org.apache.cxf</groupId>
> > >>
> > >> <artifactId>cxf-common-utilities</artifactId>
> > >>
> > >> Modified: incubator/cxf/trunk/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=
> > >> diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/pom.xml (original)
> > >> +++ incubator/cxf/trunk/pom.xml Wed Mar 14 02:31:10 2007
> > >> @@ -125,13 +125,11 @@
> > >>          <module>parent</module>
> > >>          <module>common</module>
> > >>          <module>api</module>
> > >> -        <module>rt/core</module>
> > >>          <module>metacode</module>
> > >>          <module>tools2</module>
> > >>          <module>codegen-plugin2</module>
> > >>          <module>testutils</module>
> > >>          <module>rt</module>
> > >> -        <module>tools2/javato</module>
> > >>          <module>integration</module>
> > >>          <module>systests</module>
> > >>      </modules>
> > >>
> > >> Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/x
> > >> ml/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
> > >> +++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Wed Mar 14
> > >> 02:31:10 2007
> > >> @@ -73,9 +73,9 @@
> > >>          </dependency>
> > >>
> > >>           <dependency>
> > >> -	            <groupId>org.apache.cxf</groupId>
> > >> -	            <artifactId>cxf-tools2-common</artifactId>
> > >> -	            <version>${project.version}</version>
> > >> +	     <groupId>org.apache.cxf</groupId>
> > >> +	     <artifactId>cxf-tools2-common</artifactId>
> > >> +	     <version>${project.version}</version>
> > >>          </dependency>
> > >>
> > >>
> > >>
> > >> Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
> > >> g/jaxb/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
> > >> +++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Wed Mar
> > >> 14 02:31:10
> > >> +++ 2007
> > >> @@ -55,6 +55,28 @@
> > >>                      </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>
> > >> +
> > >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot
> > >>> +                            <xsdOptions>
> > >> +                                <xsdOption>
> > >> +
> > >> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> > >> +                                </xsdOption>
> > >> +                            </xsdOptions>
> > >> +                        </configuration>
> > >> +                        <goals>
> > >> +                            <goal>xsdtojava</goal>
> > >> +                        </goals>
> > >> +                    </execution>
> > >> +                </executions>
> > >> +            </plugin>
> > >>          </plugins>
> > >>      </build>
> > >>
> > >>
> > >> Added:
> > >> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> > >> l/jaxb/misc_test.xsd
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
> >
> > g/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd?view=auto&rev=5180
> >8
> >
> > >> 2 ==============================================================
> > >> ================
> > >> ---
> > >> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> > >> l/jaxb/misc_test.xsd (added)
> > >> +++
> >
> > incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb
> >
> > >> +++ /misc_test.xsd Wed Mar 14 02:31:10 2007
> > >> @@ -0,0 +1,10 @@
> > >> +<?xml version="1.0" encoding="UTF-8"?> <schema
> > >> +xmlns="http://www.w3.org/2001/XMLSchema"
> > >> targetNamespace="http://cxf.apache.org/jaxb_misc"
> > >> +    xmlns:xs="http://www.w3.org/2001/XMLSchema"
> > >> xmlns:tns="http://cxf.apache.org/jaxb_misc">
> > >> +    <xs:complexType name="Base64WithDefaultValueType">
> > >> +        <xs:sequence>
> > >> +            <xs:element name="EndPart" type="xs:string" />
> > >> +        </xs:sequence>
> > >> +        <xs:attribute name="AttributeWithDefaultValue"
> > >> type="xs:base64Binary" default="1223" />
> > >> +    </xs:complexType>
> > >> +</schema>
> > >> \ No newline at end of file
> > >>
> > >> Modified: incubator/cxf/trunk/rt/management/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management
> > >> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/rt/management/pom.xml (original)
> > >> +++ incubator/cxf/trunk/rt/management/pom.xml Wed Mar 14 02:31:10
> > >> +++ 2007
> > >> @@ -67,12 +67,6 @@
> > >>          </dependency>
> > >>
> > >>          <dependency>
> > >> -	    <groupId>org.apache.cxf</groupId>
> > >> -	    <artifactId>cxf-tools2-xjc-dv</artifactId>
> > >> -	    <version>${project.version}</version>
> > >> -        </dependency>
> > >> -
> > >> -        <dependency>
> > >>              <groupId>org.easymock</groupId>
> > >>              <artifactId>easymockclassextension</artifactId>
> > >>              <scope>test</scope>
> > >>
> > >> Modified: incubator/cxf/trunk/rt/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?vi
> > >> ew=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/rt/pom.xml (original)
> > >> +++ incubator/cxf/trunk/rt/pom.xml Wed Mar 14 02:31:10 2007
> > >> @@ -32,7 +32,7 @@
> > >>      </parent>
> > >>
> > >>      <modules>
> > >> -        <module>management</module>
> > >> +        <module>core</module>
> > >>          <module>transports/local</module>
> > >>          <module>databinding/jaxb</module>
> > >>          <module>databinding/aegis</module>
> > >> @@ -46,6 +46,7 @@
> > >>          <module>ws/policy</module>
> > >>          <module>ws/addr</module>
> > >>          <module>ws/rm</module>
> > >> +        <module>management</module>
> > >>      </modules>
> > >>
> > >>      <scm>
> > >>
> > >> Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/
> > >> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
> > >> +++ incubator/cxf/trunk/rt/ws/policy/pom.xml Wed Mar 14
> >
> > 02:31:10 2007
> >
> > >> @@ -116,7 +116,7 @@
> > >>              </plugin>
> > >>              <plugin>
> > >>                  <groupId>org.apache.cxf</groupId>
> > >> -                <artifactId>cxf-codegen-plugin</artifactId>
> > >> +                <artifactId>cxf-codegen-plugin2</artifactId>
> > >>                  <version>${project.version}</version>
> > >>                  <executions>
> > >>                      <execution>
> > >>
> > >> Modified: incubator/cxf/trunk/testutils/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom
> > >> .xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/testutils/pom.xml (original)
> > >> +++ incubator/cxf/trunk/testutils/pom.xml Wed Mar 14 02:31:10
> > >> 2007 @@ -143,41 +143,6 @@
> > >>              </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>
> > >> -
> > >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot
> > >>> -                            <xsdOptions>
> > >> -                                <xsdOption>
> > >> -
> > >> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> > >> -                                </xsdOption>
> > >> -                            </xsdOptions>
> > >> -                        </configuration>
> > >> -                        <goals>
> > >> -                            <goal>xsdtojava</goal>
> > >> -                        </goals>
> > >> -                    </execution>
> > >> -                </executions>
> > >> -                <dependencies>
> > >> -		                    <dependency>
> > >> -
> > >> <groupId>org.apache.cxf</groupId>
> > >> -
> > >> <artifactId>cxf-tools2-xjc-dv</artifactId>
> > >> -
> > >> <version>${project.version}</version>
> > >> -		                    </dependency>
> > >> -		                    <dependency>
> > >> -
> > >> <groupId>org.apache.cxf</groupId>
> > >> -
> > >> <artifactId>cxf-common-utilities</artifactId>
> > >> -
> > >> <version>${project.version}</version>
> > >> -		                    </dependency>
> > >> -                </dependencies>
> > >> -
> > >> -            </plugin>
> > >> -            <plugin>
> > >> -                <groupId>org.apache.cxf</groupId>
> > >>                  <artifactId>cxf-codegen-plugin2</artifactId>
> > >>                  <version>${project.version}</version>
> > >>                  <executions>
> > >> @@ -186,11 +151,6 @@
> > >>                          <phase>generate-sources</phase>
> > >>                          <configuration>
> > >>
> > >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot
> > >>> -                            <xsdOptions>
> > >> -                                <xsdOption>
> > >> -
> > >> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> > >> -                                </xsdOption>
> > >> -                            </xsdOptions>
> > >>                              <wsdlOptions>
> > >>                                  <wsdlOption>
> > >>
> > >> <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
> > >>
> > >> Modified: incubator/cxf/trunk/tools2/common/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common
> > >> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/tools2/common/pom.xml (original)
> > >> +++ incubator/cxf/trunk/tools2/common/pom.xml Wed Mar 14 02:31:10
> > >> +++ 2007
> > >> @@ -1,20 +1,20 @@
> > >>  <!--
> > >> -  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
> > >> -  to you under the Apache License, Version 2.0 (the
> > >> -  "License"); you may not use this file except in compliance
> > >> -  with the License. You may obtain a copy of the License at
> > >> -
> > >> -  http://www.apache.org/licenses/LICENSE-2.0
> > >> -
> > >> -  Unless required by applicable law or agreed to in writing,
> > >> -  software distributed under the License is distributed on an
> > >> -  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > >> -  KIND, either express or implied. See the License for the
> > >> -  specific language governing permissions and limitations
> > >> -  under the License.
> > >> +    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
> > >> +    to you under the Apache License, Version 2.0 (the
> > >> +    "License"); you may not use this file except in compliance
> > >> +    with the License. You may obtain a copy of the License at
> > >> +
> > >> +    http://www.apache.org/licenses/LICENSE-2.0
> > >> +
> > >> +    Unless required by applicable law or agreed to in writing,
> > >> +    software distributed under the License is distributed on an
> > >> +    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > >> +    KIND, either express or implied. See the License for the
> > >> +    specific language governing permissions and limitations
> > >> +    under the License.
> > >>  -->
> > >>  <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>
> > >> @@ -26,120 +26,120 @@
> > >>      <url>http://cwiki.apache.org/CXF</url>
> > >>
> > >>      <parent>
> > >> -        <groupId>org.apache.cxf</groupId>
> > >> -        <artifactId>cxf-parent</artifactId>
> > >> -        <version>2.0-incubator-RC-SNAPSHOT</version>
> > >> -        <relativePath>../../parent/pom.xml</relativePath>
> > >> +	<groupId>org.apache.cxf</groupId>
> > >> +	<artifactId>cxf-parent</artifactId>
> > >> +	<version>2.0-incubator-RC-SNAPSHOT</version>
> > >> +	<relativePath>../../parent/pom.xml</relativePath>
> > >>      </parent>
> > >>
> > >> -     <dependencies>
> > >> -            <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>velocity</groupId>
> > >> -                <artifactId>velocity</artifactId>
> > >> -            </dependency>
> > >> -
> > >> -            <dependency>
> > >> -                <groupId>wsdl4j</groupId>
> > >> -                <artifactId>wsdl4j</artifactId>
> > >> -            </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.soap</groupId>
> > >> -                <artifactId>saaj-api</artifactId>
> > >> -            </dependency>
> > >> -
> > >> -            <dependency>
> > >> -                <groupId>org.apache.geronimo.specs</groupId>
> > >> -
> >
> > <artifactId>geronimo-activation_1.1_spec</artifactId>
> >
> > >> -            </dependency>
> > >> +    <dependencies>
> > >> +	<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>velocity</groupId>
> > >> +	    <artifactId>velocity</artifactId>
> > >> +	</dependency>
> > >> +
> > >> +	<dependency>
> > >> +	    <groupId>wsdl4j</groupId>
> > >> +	    <artifactId>wsdl4j</artifactId>
> > >> +	</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.soap</groupId>
> > >> +	    <artifactId>saaj-api</artifactId>
> > >> +	</dependency>
> > >> +
> > >> +	<dependency>
> > >> +	    <groupId>org.apache.geronimo.specs</groupId>
> > >> +	    <artifactId>geronimo-activation_1.1_spec</artifactId>
> > >> +	</dependency>
> > >>
> > >> -            <dependency>
> > >> -                <groupId>org.apache.cxf</groupId>
> > >> -                <artifactId>cxf-common-utilities</artifactId>
> > >> -                <version>${project.version}</version>
> > >> -            </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-api</artifactId>
> > >> -	    	<version>${project.version}</version>
> > >> -            </dependency>
> > >> -
> > >> -        </dependencies>
> > >> +	<dependency>
> > >> +	    <groupId>org.apache.cxf</groupId>
> > >> +	    <artifactId>cxf-common-utilities</artifactId>
> > >> +	    <version>${project.version}</version>
> > >> +	</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-api</artifactId>
> > >> +	    <version>${project.version}</version>
> > >> +	</dependency>
> > >> +
> > >> +    </dependencies>
> > >>
> > >>
> > >>      <scm>
> > >> -
> > >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> > >> cxf/trunk/tools2/common</connection>
> > >> -
> > >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> > >> incubator/cxf/trunk/tools2/common</developerConnection>
> > >> +
> > >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> > >> cxf/trunk/tools2/common</connection>
> > >> +
> > >> +<developerConnection>scm:svn:https://svn.apache.org/repos/asf
> > >> /incubator
> > >> +/cxf/trunk/tools2/common</developerConnection>
> > >>      </scm>
> > >>
> > >>      <build>
> > >> -            <plugins>
> > >> -                <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>
> > >> -
> > >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot
> > >>> -                                <xsdOptions>
> > >> -                                    <xsdOption>
> > >> -
> >
> > <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd
> >>
> >
> > >> -
> > >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
> > >> nding.xjb</bindingFile>
> > >> -                                        <deleteDirs>
> > >> -
> > >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> > >> e/cxf/wsdl</deleteDir>
> > >> -                                        </deleteDirs>
> > >> -                                    </xsdOption>
> > >> -
> > >> -                                <xsdOption>
> > >> -
> > >> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
> > >> -
> > >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
> > >> b</bindingFile>
> > >> -                                    <deleteDirs>
> > >> -
> > >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> > >> e/cxf/wsdl</deleteDir>
> > >> -                                    </deleteDirs>
> > >> -                                </xsdOption>
> > >> -
> > >> -                                </xsdOptions>
> > >> -                            </configuration>
> > >> -                            <goals>
> > >> -                                <goal>xsdtojava</goal>
> > >> -                            </goals>
> > >> -                        </execution>
> > >> -                    </executions>
> > >> -                </plugin>
> > >> -            </plugins>
> > >> -     </build>
> > >> +	<plugins>
> > >> +	    <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>
> > >> +
> > >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot
> > >>> +			    <xsdOptions>
> > >> +				<xsdOption>
> > >> +
> >
> > <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd
> >>
> >
> > >> +
> > >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
> > >> nding.xjb</bindingFile>
> > >> +				    <deleteDirs>
> > >> +
> > >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> > >> e/cxf/wsdl</deleteDir>
> > >> +				    </deleteDirs>
> > >> +				</xsdOption>
> > >> +
> > >> +				<xsdOption>
> > >> +
> > >> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
> > >> +
> > >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
> > >> b</bindingFile>
> > >> +				    <deleteDirs>
> > >> +
> > >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> > >> e/cxf/wsdl</deleteDir>
> > >> +				    </deleteDirs>
> > >> +				</xsdOption>
> > >> +
> > >> +			    </xsdOptions>
> > >> +			</configuration>
> > >> +			<goals>
> > >> +			    <goal>xsdtojava</goal>
> > >> +			</goals>
> > >> +		    </execution>
> > >> +		</executions>
> > >> +	    </plugin>
> > >> +	</plugins>
> > >> +    </build>
> > >>
> > >>  </project>
> > >>
> > >> Modified: incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
> > >> e-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml (original)
> > >> +++ incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml Wed Mar 14
> > >> +++ 02:31:10 2007
> > >> @@ -155,7 +155,7 @@
> > >>              </plugin>
> > >>              <plugin>
> > >>                  <groupId>org.apache.cxf</groupId>
> > >> -                <artifactId>cxf-codegen-plugin</artifactId>
> > >> +                <artifactId>cxf-codegen-plugin2</artifactId>
> > >>                  <version>${project.version}</version>
> > >>                  <executions>
> > >>                      <execution>
> > >>
> > >> Modified: incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
> > >> e3.1-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
> > >> (original) +++
> > >> incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
> >
> > Wed Mar 14
> >
> > >> +++ 02:31:10 2007
> > >> @@ -155,7 +155,7 @@
> > >>              </plugin>
> > >>              <plugin>
> > >>                  <groupId>org.apache.cxf</groupId>
> > >> -                <artifactId>cxf-codegen-plugin</artifactId>
> > >> +                <artifactId>cxf-codegen-plugin2</artifactId>
> > >>                  <version>${project.version}</version>
> > >>                  <executions>
> > >>                      <execution>
> > >>
> > >> Modified: incubator/cxf/trunk/tools2/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/pom.xm
> > >> l?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/tools2/pom.xml (original)
> > >> +++ incubator/cxf/trunk/tools2/pom.xml Wed Mar 14 02:31:10 2007
> > >> @@ -36,6 +36,7 @@
> > >>          <module>validator</module>
> > >>          <module>wsdlto</module>
> > >>          <module>xjc</module>
> > >> +        <module>javato</module>
> > >>      </modules>
> > >>
> > >>      <scm>
> > >>
> > >> Modified: incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto
> > >> /misc/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml (original)
> > >> +++ incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml Wed Mar 14
> > >> 02:31:10
> > >> +++ 2007
> > >> @@ -22,7 +22,7 @@
> > >>      <artifactId>cxf-tools2-misctools</artifactId>
> > >>      <packaging>jar</packaging>
> > >>      <version>2.0-incubator-RC-SNAPSHOT</version>
> > >> -    <name>Apache CXF Command Line Misctools</name>
> > >> +    <name>Apache CXF Command Line Tools2 WSDLTo Misctools</name>
> > >>      <url>http://cwiki.apache.org/CXF</url>
> > >>
> > >>      <parent>
> > >>
> > >> Modified: incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
> > >> -test/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml (original)
> > >> +++ incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml Wed Mar 14
> > >> 02:31:10
> > >> +++ 2007
> > >> @@ -96,7 +96,7 @@
> > >>                  <dependencies>
> > >>                      <dependency>
> > >>                          <groupId>org.apache.cxf</groupId>
> > >> -                       
> > >> <artifactId>cxf-tools-xjc-dv</artifactId> +                      
> > >>  <artifactId>cxf-tools2-xjc-dv</artifactId>
> > >> <version>${project.version}</version> </dependency>
> > >>                  </dependencies>
> > >> @@ -106,8 +106,8 @@
> > >>
> > >>
> > >>      <scm>
> > >> -
> > >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> > >> cxf/trunk/tools/xjc/dv-test</connection>
> > >> -
> > >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> > >> incubator/cxf/trunk/tools/xjc/dv-test</developerConnection>
> > >> +
> > >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> > >> cxf/trunk/tools2/xjc/dv-test</connection>
> > >> +
> > >> +
> >
> > <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incuba
> >t
> >
> > >> o
> > >> + r/cxf/trunk/tools2/xjc/dv-test</developerConnection>
> > >>      </scm>
> > >>
> > >>  </project>
> > >>
> > >> Modified: incubator/cxf/trunk/tools2/xjc/dv/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
> > >> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/tools2/xjc/dv/pom.xml (original)
> > >> +++ incubator/cxf/trunk/tools2/xjc/dv/pom.xml Wed Mar 14 02:31:10
> > >> +++ 2007
> > >> @@ -54,8 +54,8 @@
> > >>
> > >>
> > >>      <scm>
> > >> -
> > >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> > >> cxf/trunk/tools/xjc/dv</connection>
> > >> -
> > >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> > >> incubator/cxf/trunk/tools/xjc/dv</developerConnection>
> > >> +
> > >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> > >> cxf/trunk/tools2/xjc/dv</connection>
> > >> +
> > >> +
> >
> > <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incuba
> >t
> >
> > >> o
> > >> + r/cxf/trunk/tools2/xjc/dv</developerConnection>
> > >>      </scm>
> > >>
> > >>  </project>
> > >>
> > >> Modified: incubator/cxf/trunk/tools2/xjc/pom.xml
> > >> URL:
> > >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/po
> > >> m.xml?view=diff&rev=518082&r1=518081&r2=518082
> > >> ==============================================================
> > >> ================
> > >> --- incubator/cxf/trunk/tools2/xjc/pom.xml (original)
> > >> +++ incubator/cxf/trunk/tools2/xjc/pom.xml Wed Mar 14 02:31:10
> > >> 2007 @@ -38,8 +38,8 @@
> > >>      </modules>
> > >>
> > >>      <scm>
> > >> -
> > >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> > >> cxf/trunk/tools/xjc</connection>
> > >> -
> > >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> > >> incubator/cxf/trunk/tools/xjc</developerConnection>
> > >> +
> > >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> > >> cxf/trunk/tools2/xjc</connection>
> > >> +
> > >> +
> >
> > <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incuba
> >t
> >
> > >> o
> > >> + r/cxf/trunk/tools2/xjc</developerConnection>
> > >>      </scm>
> > >>
> > >>  </project>

-- 
J. Daniel Kulp
Principal Engineer
IONA
P: 781-902-8727    C: 508-380-7194
daniel.kulp@iona.com
http://www.dankulp.com/blog

RE: svn commit: r518082 [tools2 issue ...]

Posted by "Glynn, Eoghan" <eo...@iona.com>.

Still broken for me despite an svn update & rm -r
~/.m2/repo/org/apache/cxf, so I've rolled back to the last known good
revision (517791).
 

> -----Original Message-----
> From: James Mao [mailto:james.mao@iona.com] 
> Sent: 14 March 2007 12:38
> To: cxf-dev@incubator.apache.org
> Cc: cxf-commits@incubator.apache.org
> Subject: Re: svn commit: r518082 - in /incubator/cxf/trunk: 
> ./ distribution/ integration/jca/ metacode/ rt/ 
> rt/bindings/xml/ rt/databinding/jaxb/ 
> rt/databinding/jaxb/src/main/resources/wsdl/ 
> rt/databinding/jaxb/src/main/resources/wsdl/jaxb/ 
> rt/management/ rt/ws/po
> 
> Hi Eoghan,
> 
> It should , can you try a mvn clean install. if it's not 
> working, Please clean all the artifacts in 
> .m2/repository/org/apache/cxf/* And try again
> 
> Sorry to introduce so many inconvenience :(
> 
> James.
> > James,
> >
> > Since your update of the pom to pick up the cxf-tools2-* as 
> opposed to
> > cxf-tools-* I'm seeing a build failure as below.
> >
> > Have the tool2 artifacts actually been pushed up to the maven repo?
> >
> > /Eoghan
> >
> >
> >
> > [ERROR] BUILD ERROR
> > [INFO]
> > 
> ----------------------------------------------------------------------
> > --
> > [INFO] Failed to resolve artifact.
> >
> > Missing:
> > ----------
> > 1) org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT
> >
> >   Try downloading the file manually from the project website.
> >
> >   Then, install it using the command:
> >       mvn install:install-file -DgroupId=org.apache.cxf 
> > -DartifactId=cxf-tools2-xjc-dv \
> >           -Dversion=2.0-incubator-RC-SNAPSHOT -Dpackaging=jar 
> > -Dfile=/path/to/file
> >
> >   Path to dependency:
> >         1)
> > org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT
> >         2)
> > org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT
> >
> > ----------
> > 1 required artifact is missing.
> >
> > for artifact:
> >   
> org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT
> >
> > from the specified remote repositories:
> >   central (http://repo1.maven.org/maven2)
> >
> >  
> >
> >   
> >> -----Original Message-----
> >> From: mmao@apache.org [mailto:mmao@apache.org]
> >> Sent: 14 March 2007 09:31
> >> To: cxf-commits@incubator.apache.org
> >> Subject: svn commit: r518082 - in /incubator/cxf/trunk: ./ 
> >> distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/ 
> >> rt/databinding/jaxb/ rt/databinding/jaxb/src/main/resources/wsdl/
> >> rt/databinding/jaxb/src/main/resources/wsdl/jaxb/
> >> rt/management/ rt/ws/pol...
> >>
> >> Author: mmao
> >> Date: Wed Mar 14 02:31:10 2007
> >> New Revision: 518082
> >>
> >> URL: http://svn.apache.org/viewvc?view=rev&rev=518082
> >> Log:
> >> Fix build and pom updates
> >>
> >> * update all the pom to use tools2
> >> * move misc_test.xsd to rt/databinding/jaxb, since it's 
> only used in 
> >> this module
> >> * there is a bug in common/xsd plugin when loading jaxb 
> plugins, we 
> >> temporarily add the dependency in metacode module to solve the 
> >> problem.
> >>
> >> Added:
> >>     
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/
> >>     
> >> 
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/
> >>     
> >> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> >> l/jaxb/misc_test.xsd
> >> Removed:
> >>     incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb/
> >> Modified:
> >>     incubator/cxf/trunk/distribution/pom.xml
> >>     incubator/cxf/trunk/integration/jca/pom.xml
> >>     incubator/cxf/trunk/metacode/pom.xml
> >>     incubator/cxf/trunk/pom.xml
> >>     incubator/cxf/trunk/rt/bindings/xml/pom.xml
> >>     incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
> >>     incubator/cxf/trunk/rt/management/pom.xml
> >>     incubator/cxf/trunk/rt/pom.xml
> >>     incubator/cxf/trunk/rt/ws/policy/pom.xml
> >>     incubator/cxf/trunk/testutils/pom.xml
> >>     incubator/cxf/trunk/tools2/common/pom.xml
> >>     incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
> >>     incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
> >>     incubator/cxf/trunk/tools2/pom.xml
> >>     incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
> >>     incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
> >>     incubator/cxf/trunk/tools2/xjc/dv/pom.xml
> >>     incubator/cxf/trunk/tools2/xjc/pom.xml
> >>
> >> Modified: incubator/cxf/trunk/distribution/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/
> >> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/distribution/pom.xml (original)
> >> +++ incubator/cxf/trunk/distribution/pom.xml Wed Mar 14 
> 02:31:10 2007
> >> @@ -55,32 +55,27 @@
> >>          </dependency>
> >>          <dependency>
> >>              <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-common</artifactId>
> >> +            <artifactId>cxf-tools2-common</artifactId>
> >>              <version>${pom.version}</version>
> >>          </dependency>
> >>          <dependency>
> >>              <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-validator</artifactId>
> >> +            <artifactId>cxf-tools2-validator</artifactId>
> >>              <version>${pom.version}</version>
> >>          </dependency>
> >>          <dependency>
> >>              <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-wsdl2java</artifactId>
> >> +            <artifactId>cxf-tools2-wsdl2java</artifactId>
> >>              <version>${pom.version}</version>
> >>          </dependency>
> >>          <dependency>
> >>              <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-java2wsdl</artifactId>
> >> +            <artifactId>cxf-tools2-java2wsdl</artifactId>
> >>              <version>${pom.version}</version>
> >>          </dependency>
> >>          <dependency>
> >>              <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-misctools</artifactId>
> >> -            <version>${pom.version}</version>
> >> -        </dependency>
> >> -        <dependency>
> >> -            <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-xjc-dv</artifactId>
> >> +            <artifactId>cxf-tools2-xjc-dv</artifactId>
> >>              <version>${pom.version}</version>
> >>          </dependency>
> >>  
> >>
> >> Modified: incubator/cxf/trunk/integration/jca/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/j
> >> ca/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/integration/jca/pom.xml (original)
> >> +++ incubator/cxf/trunk/integration/jca/pom.xml Wed Mar 14
> >> 02:31:10 2007
> >> @@ -82,7 +82,7 @@
> >>  
> >>          <dependency>
> >>              <groupId>org.apache.cxf</groupId>
> >> -            <artifactId>cxf-tools-common</artifactId>
> >> +            <artifactId>cxf-tools2-common</artifactId>
> >>              <version>${project.version}</version>
> >>          </dependency>
> >>  
> >>
> >> Modified: incubator/cxf/trunk/metacode/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/pom.
> >> xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/metacode/pom.xml (original)
> >> +++ incubator/cxf/trunk/metacode/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -142,7 +142,13 @@
> >>                          </goals>
> >>                      </execution>
> >>                  </executions>
> >> +
> >>                  <dependencies>
> >> +                    <dependency>
> >> +                        <groupId>org.apache.cxf</groupId>
> >> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
> >> +                        <version>${project.version}</version>
> >> +                    </dependency>
> >>                      <dependency>
> >>                          <groupId>org.apache.cxf</groupId>
> >>                          
> >> <artifactId>cxf-common-utilities</artifactId>
> >>
> >> Modified: incubator/cxf/trunk/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=
> >> diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/pom.xml (original)
> >> +++ incubator/cxf/trunk/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -125,13 +125,11 @@
> >>          <module>parent</module>
> >>          <module>common</module>
> >>          <module>api</module>
> >> -        <module>rt/core</module>       
> >>          <module>metacode</module>
> >>          <module>tools2</module>
> >>          <module>codegen-plugin2</module>       
> >>          <module>testutils</module>
> >>          <module>rt</module>
> >> -        <module>tools2/javato</module>
> >>          <module>integration</module>
> >>          <module>systests</module>
> >>      </modules>
> >>
> >> Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/x
> >> ml/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
> >> +++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Wed Mar 14
> >> 02:31:10 2007
> >> @@ -73,9 +73,9 @@
> >>          </dependency>
> >>          
> >>           <dependency>
> >> -	            <groupId>org.apache.cxf</groupId>
> >> -	            <artifactId>cxf-tools2-common</artifactId>
> >> -	            <version>${project.version}</version>
> >> +	     <groupId>org.apache.cxf</groupId>
> >> +	     <artifactId>cxf-tools2-common</artifactId>
> >> +	     <version>${project.version}</version>
> >>          </dependency>
> >>         
> >>          
> >>
> >> Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
> >> g/jaxb/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
> >> +++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Wed Mar
> >> 14 02:31:10
> >> +++ 2007
> >> @@ -55,6 +55,28 @@
> >>                      </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>
> >> +                            
> >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> >> +                            <xsdOptions>
> >> +                                <xsdOption>
> >> +                                    
> >> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> >> +                                </xsdOption>
> >> +                            </xsdOptions>
> >> +                        </configuration>
> >> +                        <goals>
> >> +                            <goal>xsdtojava</goal>
> >> +                        </goals>
> >> +                    </execution>
> >> +                </executions>
> >> +            </plugin>
> >>          </plugins>
> >>      </build>
> >>  
> >>
> >> Added: 
> >> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> >> l/jaxb/misc_test.xsd
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
> >> 
> g/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd?view=auto&rev=51808
> >> 2 ==============================================================
> >> ================
> >> ---
> >> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> >> l/jaxb/misc_test.xsd (added)
> >> +++ 
> >> 
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb
> >> +++ /misc_test.xsd Wed Mar 14 02:31:10 2007
> >> @@ -0,0 +1,10 @@
> >> +<?xml version="1.0" encoding="UTF-8"?> <schema 
> >> +xmlns="http://www.w3.org/2001/XMLSchema"
> >> targetNamespace="http://cxf.apache.org/jaxb_misc"
> >> +    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
> >> xmlns:tns="http://cxf.apache.org/jaxb_misc">
> >> +    <xs:complexType name="Base64WithDefaultValueType">
> >> +        <xs:sequence>
> >> +            <xs:element name="EndPart" type="xs:string" />
> >> +        </xs:sequence>
> >> +        <xs:attribute name="AttributeWithDefaultValue" 
> >> type="xs:base64Binary" default="1223" />
> >> +    </xs:complexType>
> >> +</schema>
> >> \ No newline at end of file
> >>
> >> Modified: incubator/cxf/trunk/rt/management/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management
> >> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/rt/management/pom.xml (original)
> >> +++ incubator/cxf/trunk/rt/management/pom.xml Wed Mar 14 02:31:10 
> >> +++ 2007
> >> @@ -67,12 +67,6 @@
> >>          </dependency>
> >>          
> >>          <dependency>
> >> -	    <groupId>org.apache.cxf</groupId>
> >> -	    <artifactId>cxf-tools2-xjc-dv</artifactId>
> >> -	    <version>${project.version}</version>
> >> -        </dependency>
> >> -
> >> -        <dependency>
> >>              <groupId>org.easymock</groupId>
> >>              <artifactId>easymockclassextension</artifactId>
> >>              <scope>test</scope>
> >>
> >> Modified: incubator/cxf/trunk/rt/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?vi
> >> ew=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/rt/pom.xml (original)
> >> +++ incubator/cxf/trunk/rt/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -32,7 +32,7 @@
> >>      </parent>
> >>  
> >>      <modules>
> >> -        <module>management</module>
> >> +        <module>core</module>
> >>          <module>transports/local</module>
> >>          <module>databinding/jaxb</module>
> >>          <module>databinding/aegis</module>
> >> @@ -46,6 +46,7 @@
> >>          <module>ws/policy</module>
> >>          <module>ws/addr</module>
> >>          <module>ws/rm</module>
> >> +        <module>management</module>
> >>      </modules>
> >>  
> >>      <scm>
> >>
> >> Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/
> >> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
> >> +++ incubator/cxf/trunk/rt/ws/policy/pom.xml Wed Mar 14 
> 02:31:10 2007
> >> @@ -116,7 +116,7 @@
> >>              </plugin>
> >>              <plugin>
> >>                  <groupId>org.apache.cxf</groupId>
> >> -                <artifactId>cxf-codegen-plugin</artifactId>
> >> +                <artifactId>cxf-codegen-plugin2</artifactId>
> >>                  <version>${project.version}</version>
> >>                  <executions>
> >>                      <execution>
> >>
> >> Modified: incubator/cxf/trunk/testutils/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom
> >> .xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/testutils/pom.xml (original)
> >> +++ incubator/cxf/trunk/testutils/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -143,41 +143,6 @@
> >>              </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>
> >> -                            
> >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> >> -                            <xsdOptions>
> >> -                                <xsdOption>
> >> -                                    
> >> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> >> -                                </xsdOption>
> >> -                            </xsdOptions>
> >> -                        </configuration>
> >> -                        <goals>
> >> -                            <goal>xsdtojava</goal>
> >> -                        </goals>
> >> -                    </execution>
> >> -                </executions>
> >> -                <dependencies>
> >> -		                    <dependency>
> >> -		                        
> >> <groupId>org.apache.cxf</groupId>
> >> -		                        
> >> <artifactId>cxf-tools2-xjc-dv</artifactId>
> >> -		                        
> >> <version>${project.version}</version>
> >> -		                    </dependency>
> >> -		                    <dependency>
> >> -		                        
> >> <groupId>org.apache.cxf</groupId>
> >> -		                        
> >> <artifactId>cxf-common-utilities</artifactId>
> >> -		                        
> >> <version>${project.version}</version>
> >> -		                    </dependency>
> >> -                </dependencies>
> >> -                
> >> -            </plugin>
> >> -            <plugin>
> >> -                <groupId>org.apache.cxf</groupId>
> >>                  <artifactId>cxf-codegen-plugin2</artifactId>
> >>                  <version>${project.version}</version>
> >>                  <executions>
> >> @@ -186,11 +151,6 @@
> >>                          <phase>generate-sources</phase>
> >>                          <configuration>
> >>                              
> >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> >> -                            <xsdOptions>
> >> -                                <xsdOption>
> >> -                                    
> >> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> >> -                                </xsdOption>
> >> -                            </xsdOptions>
> >>                              <wsdlOptions>
> >>                                  <wsdlOption>
> >>                                      
> >> <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
> >>
> >> Modified: incubator/cxf/trunk/tools2/common/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common
> >> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/common/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/common/pom.xml Wed Mar 14 02:31:10 
> >> +++ 2007
> >> @@ -1,20 +1,20 @@
> >>  <!--
> >> -  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
> >> -  to you under the Apache License, Version 2.0 (the
> >> -  "License"); you may not use this file except in compliance
> >> -  with the License. You may obtain a copy of the License at
> >> -
> >> -  http://www.apache.org/licenses/LICENSE-2.0
> >> -
> >> -  Unless required by applicable law or agreed to in writing,
> >> -  software distributed under the License is distributed on an
> >> -  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> >> -  KIND, either express or implied. See the License for the
> >> -  specific language governing permissions and limitations
> >> -  under the License.
> >> +    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
> >> +    to you under the Apache License, Version 2.0 (the
> >> +    "License"); you may not use this file except in compliance
> >> +    with the License. You may obtain a copy of the License at
> >> +    
> >> +    http://www.apache.org/licenses/LICENSE-2.0
> >> +    
> >> +    Unless required by applicable law or agreed to in writing,
> >> +    software distributed under the License is distributed on an
> >> +    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> >> +    KIND, either express or implied. See the License for the
> >> +    specific language governing permissions and limitations
> >> +    under the License.
> >>  -->
> >>  <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>
> >> @@ -26,120 +26,120 @@
> >>      <url>http://cwiki.apache.org/CXF</url>
> >>  
> >>      <parent>
> >> -        <groupId>org.apache.cxf</groupId>
> >> -        <artifactId>cxf-parent</artifactId>
> >> -        <version>2.0-incubator-RC-SNAPSHOT</version>
> >> -        <relativePath>../../parent/pom.xml</relativePath>
> >> +	<groupId>org.apache.cxf</groupId>
> >> +	<artifactId>cxf-parent</artifactId>
> >> +	<version>2.0-incubator-RC-SNAPSHOT</version>
> >> +	<relativePath>../../parent/pom.xml</relativePath>
> >>      </parent>
> >>  
> >> -     <dependencies>
> >> -            <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>velocity</groupId>
> >> -                <artifactId>velocity</artifactId>
> >> -            </dependency>
> >> -    
> >> -            <dependency>
> >> -                <groupId>wsdl4j</groupId>
> >> -                <artifactId>wsdl4j</artifactId>
> >> -            </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.soap</groupId>
> >> -                <artifactId>saaj-api</artifactId>
> >> -            </dependency>
> >> -    
> >> -            <dependency>
> >> -                <groupId>org.apache.geronimo.specs</groupId>
> >> -                
> <artifactId>geronimo-activation_1.1_spec</artifactId>
> >> -            </dependency>
> >> +    <dependencies>
> >> +	<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>velocity</groupId>
> >> +	    <artifactId>velocity</artifactId>
> >> +	</dependency>
> >> +	
> >> +	<dependency>
> >> +	    <groupId>wsdl4j</groupId>
> >> +	    <artifactId>wsdl4j</artifactId>
> >> +	</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.soap</groupId>
> >> +	    <artifactId>saaj-api</artifactId>
> >> +	</dependency>
> >> +	
> >> +	<dependency>
> >> +	    <groupId>org.apache.geronimo.specs</groupId>
> >> +	    <artifactId>geronimo-activation_1.1_spec</artifactId>
> >> +	</dependency>
> >>  
> >> -            <dependency>
> >> -                <groupId>org.apache.cxf</groupId>
> >> -                <artifactId>cxf-common-utilities</artifactId>
> >> -                <version>${project.version}</version>
> >> -            </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-api</artifactId>
> >> -	    	<version>${project.version}</version>
> >> -            </dependency>
> >> -            
> >> -        </dependencies>
> >> +	<dependency>
> >> +	    <groupId>org.apache.cxf</groupId>
> >> +	    <artifactId>cxf-common-utilities</artifactId>
> >> +	    <version>${project.version}</version>
> >> +	</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-api</artifactId>
> >> +	    <version>${project.version}</version>
> >> +	</dependency>
> >> +	
> >> +    </dependencies>
> >>  
> >>  
> >>      <scm>
> >> -        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools2/common</connection>
> >> -        
> >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> >> incubator/cxf/trunk/tools2/common</developerConnection>
> >> +	
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools2/common</connection>
> >> +	
> >> +<developerConnection>scm:svn:https://svn.apache.org/repos/asf
> >> /incubator
> >> +/cxf/trunk/tools2/common</developerConnection>
> >>      </scm>
> >>      
> >>      <build>
> >> -            <plugins>
> >> -                <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>
> >> -                                
> >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> >> -                                <xsdOptions>
> >> -                                    <xsdOption>
> >> -                                        
> >> 
> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
> >> -                                        
> >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
> >> nding.xjb</bindingFile>
> >> -                                        <deleteDirs>
> >> -                                            
> >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> >> e/cxf/wsdl</deleteDir>
> >> -                                        </deleteDirs>
> >> -                                    </xsdOption>
> >> -                                    
> >> -                                <xsdOption>
> >> -                                    
> >> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
> >> -                                    
> >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
> >> b</bindingFile>
> >> -                                    <deleteDirs>
> >> -                                        
> >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> >> e/cxf/wsdl</deleteDir>
> >> -                                    </deleteDirs>
> >> -                                </xsdOption>
> >> -                                    
> >> -                                </xsdOptions>
> >> -                            </configuration>
> >> -                            <goals>
> >> -                                <goal>xsdtojava</goal>
> >> -                            </goals>
> >> -                        </execution>
> >> -                    </executions>
> >> -                </plugin>
> >> -            </plugins>
> >> -     </build>    
> >> +	<plugins>
> >> +	    <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>
> >> +			    
> >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> >> +			    <xsdOptions>
> >> +				<xsdOption>
> >> +				    
> >> 
> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
> >> +				    
> >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
> >> nding.xjb</bindingFile>
> >> +				    <deleteDirs>
> >> +					
> >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> >> e/cxf/wsdl</deleteDir>
> >> +				    </deleteDirs>
> >> +				</xsdOption>
> >> +				
> >> +				<xsdOption>
> >> +				    
> >> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
> >> +				    
> >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
> >> b</bindingFile>
> >> +				    <deleteDirs>
> >> +					
> >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> >> e/cxf/wsdl</deleteDir>
> >> +				    </deleteDirs>
> >> +				</xsdOption>
> >> +				
> >> +			    </xsdOptions>
> >> +			</configuration>
> >> +			<goals>
> >> +			    <goal>xsdtojava</goal>
> >> +			</goals>
> >> +		    </execution>
> >> +		</executions>
> >> +	    </plugin>
> >> +	</plugins>
> >> +    </build>    
> >>  
> >>  </project>
> >>
> >> Modified: incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
> >> e-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml Wed Mar 14 
> >> +++ 02:31:10 2007
> >> @@ -155,7 +155,7 @@
> >>              </plugin>
> >>              <plugin>
> >>                  <groupId>org.apache.cxf</groupId>
> >> -                <artifactId>cxf-codegen-plugin</artifactId>
> >> +                <artifactId>cxf-codegen-plugin2</artifactId>
> >>                  <version>${project.version}</version>
> >>                  <executions>
> >>                      <execution>
> >>
> >> Modified: incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
> >> e3.1-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml 
> Wed Mar 14 
> >> +++ 02:31:10 2007
> >> @@ -155,7 +155,7 @@
> >>              </plugin>
> >>              <plugin>
> >>                  <groupId>org.apache.cxf</groupId>
> >> -                <artifactId>cxf-codegen-plugin</artifactId>
> >> +                <artifactId>cxf-codegen-plugin2</artifactId>
> >>                  <version>${project.version}</version>
> >>                  <executions>
> >>                      <execution>
> >>
> >> Modified: incubator/cxf/trunk/tools2/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/pom.xm
> >> l?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -36,6 +36,7 @@
> >>          <module>validator</module>
> >>          <module>wsdlto</module>
> >>          <module>xjc</module>
> >> +        <module>javato</module>
> >>      </modules>
> >>  
> >>      <scm>
> >>
> >> Modified: incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto
> >> /misc/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml Wed Mar 14
> >> 02:31:10
> >> +++ 2007
> >> @@ -22,7 +22,7 @@
> >>      <artifactId>cxf-tools2-misctools</artifactId>
> >>      <packaging>jar</packaging>
> >>      <version>2.0-incubator-RC-SNAPSHOT</version>
> >> -    <name>Apache CXF Command Line Misctools</name>
> >> +    <name>Apache CXF Command Line Tools2 WSDLTo Misctools</name>
> >>      <url>http://cwiki.apache.org/CXF</url>
> >>  
> >>      <parent>
> >>
> >> Modified: incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
> >> -test/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml Wed Mar 14
> >> 02:31:10
> >> +++ 2007
> >> @@ -96,7 +96,7 @@
> >>                  <dependencies>
> >>                      <dependency>
> >>                          <groupId>org.apache.cxf</groupId>
> >> -                        <artifactId>cxf-tools-xjc-dv</artifactId>
> >> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
> >>                          <version>${project.version}</version>
> >>                      </dependency>
> >>                  </dependencies>
> >> @@ -106,8 +106,8 @@
> >>  
> >>  
> >>      <scm>
> >> -        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools/xjc/dv-test</connection>
> >> -        
> >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> >> incubator/cxf/trunk/tools/xjc/dv-test</developerConnection>
> >> +        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools2/xjc/dv-test</connection>
> >> +        
> >> + 
> >> 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubat
> >> o
> >> + r/cxf/trunk/tools2/xjc/dv-test</developerConnection>
> >>      </scm>
> >>  
> >>  </project>
> >>
> >> Modified: incubator/cxf/trunk/tools2/xjc/dv/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
> >> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/xjc/dv/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/xjc/dv/pom.xml Wed Mar 14 02:31:10 
> >> +++ 2007
> >> @@ -54,8 +54,8 @@
> >>  
> >>  
> >>      <scm>
> >> -        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools/xjc/dv</connection>
> >> -        
> >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> >> incubator/cxf/trunk/tools/xjc/dv</developerConnection>
> >> +        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools2/xjc/dv</connection>
> >> +        
> >> + 
> >> 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubat
> >> o
> >> + r/cxf/trunk/tools2/xjc/dv</developerConnection>
> >>      </scm>
> >>  
> >>  </project>
> >>
> >> Modified: incubator/cxf/trunk/tools2/xjc/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/po
> >> m.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/xjc/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/xjc/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -38,8 +38,8 @@
> >>      </modules>
> >>  
> >>      <scm>
> >> -        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools/xjc</connection>
> >> -        
> >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> >> incubator/cxf/trunk/tools/xjc</developerConnection>
> >> +        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools2/xjc</connection>
> >> +        
> >> + 
> >> 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubat
> >> o
> >> + r/cxf/trunk/tools2/xjc</developerConnection>
> >>      </scm>
> >>  
> >>  </project>
> >>
> >>
> >>
> >>     
> >
> >   
> 
> 

RE: svn commit: r518082 [tools2 issue ...]

Posted by "Glynn, Eoghan" <eo...@iona.com>.

Still broken for me despite an svn update & rm -r
~/.m2/repo/org/apache/cxf, so I've rolled back to the last known good
revision (517791).
 

> -----Original Message-----
> From: James Mao [mailto:james.mao@iona.com] 
> Sent: 14 March 2007 12:38
> To: cxf-dev@incubator.apache.org
> Cc: cxf-commits@incubator.apache.org
> Subject: Re: svn commit: r518082 - in /incubator/cxf/trunk: 
> ./ distribution/ integration/jca/ metacode/ rt/ 
> rt/bindings/xml/ rt/databinding/jaxb/ 
> rt/databinding/jaxb/src/main/resources/wsdl/ 
> rt/databinding/jaxb/src/main/resources/wsdl/jaxb/ 
> rt/management/ rt/ws/po
> 
> Hi Eoghan,
> 
> It should , can you try a mvn clean install. if it's not 
> working, Please clean all the artifacts in 
> .m2/repository/org/apache/cxf/* And try again
> 
> Sorry to introduce so many inconvenience :(
> 
> James.
> > James,
> >
> > Since your update of the pom to pick up the cxf-tools2-* as 
> opposed to
> > cxf-tools-* I'm seeing a build failure as below.
> >
> > Have the tool2 artifacts actually been pushed up to the maven repo?
> >
> > /Eoghan
> >
> >
> >
> > [ERROR] BUILD ERROR
> > [INFO]
> > 
> ----------------------------------------------------------------------
> > --
> > [INFO] Failed to resolve artifact.
> >
> > Missing:
> > ----------
> > 1) org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT
> >
> >   Try downloading the file manually from the project website.
> >
> >   Then, install it using the command:
> >       mvn install:install-file -DgroupId=org.apache.cxf 
> > -DartifactId=cxf-tools2-xjc-dv \
> >           -Dversion=2.0-incubator-RC-SNAPSHOT -Dpackaging=jar 
> > -Dfile=/path/to/file
> >
> >   Path to dependency:
> >         1)
> > org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT
> >         2)
> > org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT
> >
> > ----------
> > 1 required artifact is missing.
> >
> > for artifact:
> >   
> org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT
> >
> > from the specified remote repositories:
> >   central (http://repo1.maven.org/maven2)
> >
> >  
> >
> >   
> >> -----Original Message-----
> >> From: mmao@apache.org [mailto:mmao@apache.org]
> >> Sent: 14 March 2007 09:31
> >> To: cxf-commits@incubator.apache.org
> >> Subject: svn commit: r518082 - in /incubator/cxf/trunk: ./ 
> >> distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/ 
> >> rt/databinding/jaxb/ rt/databinding/jaxb/src/main/resources/wsdl/
> >> rt/databinding/jaxb/src/main/resources/wsdl/jaxb/
> >> rt/management/ rt/ws/pol...
> >>
> >> Author: mmao
> >> Date: Wed Mar 14 02:31:10 2007
> >> New Revision: 518082
> >>
> >> URL: http://svn.apache.org/viewvc?view=rev&rev=518082
> >> Log:
> >> Fix build and pom updates
> >>
> >> * update all the pom to use tools2
> >> * move misc_test.xsd to rt/databinding/jaxb, since it's 
> only used in 
> >> this module
> >> * there is a bug in common/xsd plugin when loading jaxb 
> plugins, we 
> >> temporarily add the dependency in metacode module to solve the 
> >> problem.
> >>
> >> Added:
> >>     
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/
> >>     
> >> 
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/
> >>     
> >> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> >> l/jaxb/misc_test.xsd
> >> Removed:
> >>     incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb/
> >> Modified:
> >>     incubator/cxf/trunk/distribution/pom.xml
> >>     incubator/cxf/trunk/integration/jca/pom.xml
> >>     incubator/cxf/trunk/metacode/pom.xml
> >>     incubator/cxf/trunk/pom.xml
> >>     incubator/cxf/trunk/rt/bindings/xml/pom.xml
> >>     incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
> >>     incubator/cxf/trunk/rt/management/pom.xml
> >>     incubator/cxf/trunk/rt/pom.xml
> >>     incubator/cxf/trunk/rt/ws/policy/pom.xml
> >>     incubator/cxf/trunk/testutils/pom.xml
> >>     incubator/cxf/trunk/tools2/common/pom.xml
> >>     incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
> >>     incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
> >>     incubator/cxf/trunk/tools2/pom.xml
> >>     incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
> >>     incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
> >>     incubator/cxf/trunk/tools2/xjc/dv/pom.xml
> >>     incubator/cxf/trunk/tools2/xjc/pom.xml
> >>
> >> Modified: incubator/cxf/trunk/distribution/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/
> >> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/distribution/pom.xml (original)
> >> +++ incubator/cxf/trunk/distribution/pom.xml Wed Mar 14 
> 02:31:10 2007
> >> @@ -55,32 +55,27 @@
> >>          </dependency>
> >>          <dependency>
> >>              <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-common</artifactId>
> >> +            <artifactId>cxf-tools2-common</artifactId>
> >>              <version>${pom.version}</version>
> >>          </dependency>
> >>          <dependency>
> >>              <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-validator</artifactId>
> >> +            <artifactId>cxf-tools2-validator</artifactId>
> >>              <version>${pom.version}</version>
> >>          </dependency>
> >>          <dependency>
> >>              <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-wsdl2java</artifactId>
> >> +            <artifactId>cxf-tools2-wsdl2java</artifactId>
> >>              <version>${pom.version}</version>
> >>          </dependency>
> >>          <dependency>
> >>              <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-java2wsdl</artifactId>
> >> +            <artifactId>cxf-tools2-java2wsdl</artifactId>
> >>              <version>${pom.version}</version>
> >>          </dependency>
> >>          <dependency>
> >>              <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-misctools</artifactId>
> >> -            <version>${pom.version}</version>
> >> -        </dependency>
> >> -        <dependency>
> >> -            <groupId>${pom.groupId}</groupId>
> >> -            <artifactId>cxf-tools-xjc-dv</artifactId>
> >> +            <artifactId>cxf-tools2-xjc-dv</artifactId>
> >>              <version>${pom.version}</version>
> >>          </dependency>
> >>  
> >>
> >> Modified: incubator/cxf/trunk/integration/jca/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/j
> >> ca/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/integration/jca/pom.xml (original)
> >> +++ incubator/cxf/trunk/integration/jca/pom.xml Wed Mar 14
> >> 02:31:10 2007
> >> @@ -82,7 +82,7 @@
> >>  
> >>          <dependency>
> >>              <groupId>org.apache.cxf</groupId>
> >> -            <artifactId>cxf-tools-common</artifactId>
> >> +            <artifactId>cxf-tools2-common</artifactId>
> >>              <version>${project.version}</version>
> >>          </dependency>
> >>  
> >>
> >> Modified: incubator/cxf/trunk/metacode/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/pom.
> >> xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/metacode/pom.xml (original)
> >> +++ incubator/cxf/trunk/metacode/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -142,7 +142,13 @@
> >>                          </goals>
> >>                      </execution>
> >>                  </executions>
> >> +
> >>                  <dependencies>
> >> +                    <dependency>
> >> +                        <groupId>org.apache.cxf</groupId>
> >> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
> >> +                        <version>${project.version}</version>
> >> +                    </dependency>
> >>                      <dependency>
> >>                          <groupId>org.apache.cxf</groupId>
> >>                          
> >> <artifactId>cxf-common-utilities</artifactId>
> >>
> >> Modified: incubator/cxf/trunk/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=
> >> diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/pom.xml (original)
> >> +++ incubator/cxf/trunk/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -125,13 +125,11 @@
> >>          <module>parent</module>
> >>          <module>common</module>
> >>          <module>api</module>
> >> -        <module>rt/core</module>       
> >>          <module>metacode</module>
> >>          <module>tools2</module>
> >>          <module>codegen-plugin2</module>       
> >>          <module>testutils</module>
> >>          <module>rt</module>
> >> -        <module>tools2/javato</module>
> >>          <module>integration</module>
> >>          <module>systests</module>
> >>      </modules>
> >>
> >> Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/x
> >> ml/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
> >> +++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Wed Mar 14
> >> 02:31:10 2007
> >> @@ -73,9 +73,9 @@
> >>          </dependency>
> >>          
> >>           <dependency>
> >> -	            <groupId>org.apache.cxf</groupId>
> >> -	            <artifactId>cxf-tools2-common</artifactId>
> >> -	            <version>${project.version}</version>
> >> +	     <groupId>org.apache.cxf</groupId>
> >> +	     <artifactId>cxf-tools2-common</artifactId>
> >> +	     <version>${project.version}</version>
> >>          </dependency>
> >>         
> >>          
> >>
> >> Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
> >> g/jaxb/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
> >> +++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Wed Mar
> >> 14 02:31:10
> >> +++ 2007
> >> @@ -55,6 +55,28 @@
> >>                      </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>
> >> +                            
> >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> >> +                            <xsdOptions>
> >> +                                <xsdOption>
> >> +                                    
> >> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> >> +                                </xsdOption>
> >> +                            </xsdOptions>
> >> +                        </configuration>
> >> +                        <goals>
> >> +                            <goal>xsdtojava</goal>
> >> +                        </goals>
> >> +                    </execution>
> >> +                </executions>
> >> +            </plugin>
> >>          </plugins>
> >>      </build>
> >>  
> >>
> >> Added: 
> >> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> >> l/jaxb/misc_test.xsd
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
> >> 
> g/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd?view=auto&rev=51808
> >> 2 ==============================================================
> >> ================
> >> ---
> >> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> >> l/jaxb/misc_test.xsd (added)
> >> +++ 
> >> 
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb
> >> +++ /misc_test.xsd Wed Mar 14 02:31:10 2007
> >> @@ -0,0 +1,10 @@
> >> +<?xml version="1.0" encoding="UTF-8"?> <schema 
> >> +xmlns="http://www.w3.org/2001/XMLSchema"
> >> targetNamespace="http://cxf.apache.org/jaxb_misc"
> >> +    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
> >> xmlns:tns="http://cxf.apache.org/jaxb_misc">
> >> +    <xs:complexType name="Base64WithDefaultValueType">
> >> +        <xs:sequence>
> >> +            <xs:element name="EndPart" type="xs:string" />
> >> +        </xs:sequence>
> >> +        <xs:attribute name="AttributeWithDefaultValue" 
> >> type="xs:base64Binary" default="1223" />
> >> +    </xs:complexType>
> >> +</schema>
> >> \ No newline at end of file
> >>
> >> Modified: incubator/cxf/trunk/rt/management/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management
> >> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/rt/management/pom.xml (original)
> >> +++ incubator/cxf/trunk/rt/management/pom.xml Wed Mar 14 02:31:10 
> >> +++ 2007
> >> @@ -67,12 +67,6 @@
> >>          </dependency>
> >>          
> >>          <dependency>
> >> -	    <groupId>org.apache.cxf</groupId>
> >> -	    <artifactId>cxf-tools2-xjc-dv</artifactId>
> >> -	    <version>${project.version}</version>
> >> -        </dependency>
> >> -
> >> -        <dependency>
> >>              <groupId>org.easymock</groupId>
> >>              <artifactId>easymockclassextension</artifactId>
> >>              <scope>test</scope>
> >>
> >> Modified: incubator/cxf/trunk/rt/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?vi
> >> ew=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/rt/pom.xml (original)
> >> +++ incubator/cxf/trunk/rt/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -32,7 +32,7 @@
> >>      </parent>
> >>  
> >>      <modules>
> >> -        <module>management</module>
> >> +        <module>core</module>
> >>          <module>transports/local</module>
> >>          <module>databinding/jaxb</module>
> >>          <module>databinding/aegis</module>
> >> @@ -46,6 +46,7 @@
> >>          <module>ws/policy</module>
> >>          <module>ws/addr</module>
> >>          <module>ws/rm</module>
> >> +        <module>management</module>
> >>      </modules>
> >>  
> >>      <scm>
> >>
> >> Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/
> >> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
> >> +++ incubator/cxf/trunk/rt/ws/policy/pom.xml Wed Mar 14 
> 02:31:10 2007
> >> @@ -116,7 +116,7 @@
> >>              </plugin>
> >>              <plugin>
> >>                  <groupId>org.apache.cxf</groupId>
> >> -                <artifactId>cxf-codegen-plugin</artifactId>
> >> +                <artifactId>cxf-codegen-plugin2</artifactId>
> >>                  <version>${project.version}</version>
> >>                  <executions>
> >>                      <execution>
> >>
> >> Modified: incubator/cxf/trunk/testutils/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom
> >> .xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/testutils/pom.xml (original)
> >> +++ incubator/cxf/trunk/testutils/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -143,41 +143,6 @@
> >>              </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>
> >> -                            
> >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> >> -                            <xsdOptions>
> >> -                                <xsdOption>
> >> -                                    
> >> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> >> -                                </xsdOption>
> >> -                            </xsdOptions>
> >> -                        </configuration>
> >> -                        <goals>
> >> -                            <goal>xsdtojava</goal>
> >> -                        </goals>
> >> -                    </execution>
> >> -                </executions>
> >> -                <dependencies>
> >> -		                    <dependency>
> >> -		                        
> >> <groupId>org.apache.cxf</groupId>
> >> -		                        
> >> <artifactId>cxf-tools2-xjc-dv</artifactId>
> >> -		                        
> >> <version>${project.version}</version>
> >> -		                    </dependency>
> >> -		                    <dependency>
> >> -		                        
> >> <groupId>org.apache.cxf</groupId>
> >> -		                        
> >> <artifactId>cxf-common-utilities</artifactId>
> >> -		                        
> >> <version>${project.version}</version>
> >> -		                    </dependency>
> >> -                </dependencies>
> >> -                
> >> -            </plugin>
> >> -            <plugin>
> >> -                <groupId>org.apache.cxf</groupId>
> >>                  <artifactId>cxf-codegen-plugin2</artifactId>
> >>                  <version>${project.version}</version>
> >>                  <executions>
> >> @@ -186,11 +151,6 @@
> >>                          <phase>generate-sources</phase>
> >>                          <configuration>
> >>                              
> >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> >> -                            <xsdOptions>
> >> -                                <xsdOption>
> >> -                                    
> >> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> >> -                                </xsdOption>
> >> -                            </xsdOptions>
> >>                              <wsdlOptions>
> >>                                  <wsdlOption>
> >>                                      
> >> <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
> >>
> >> Modified: incubator/cxf/trunk/tools2/common/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common
> >> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/common/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/common/pom.xml Wed Mar 14 02:31:10 
> >> +++ 2007
> >> @@ -1,20 +1,20 @@
> >>  <!--
> >> -  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
> >> -  to you under the Apache License, Version 2.0 (the
> >> -  "License"); you may not use this file except in compliance
> >> -  with the License. You may obtain a copy of the License at
> >> -
> >> -  http://www.apache.org/licenses/LICENSE-2.0
> >> -
> >> -  Unless required by applicable law or agreed to in writing,
> >> -  software distributed under the License is distributed on an
> >> -  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> >> -  KIND, either express or implied. See the License for the
> >> -  specific language governing permissions and limitations
> >> -  under the License.
> >> +    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
> >> +    to you under the Apache License, Version 2.0 (the
> >> +    "License"); you may not use this file except in compliance
> >> +    with the License. You may obtain a copy of the License at
> >> +    
> >> +    http://www.apache.org/licenses/LICENSE-2.0
> >> +    
> >> +    Unless required by applicable law or agreed to in writing,
> >> +    software distributed under the License is distributed on an
> >> +    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> >> +    KIND, either express or implied. See the License for the
> >> +    specific language governing permissions and limitations
> >> +    under the License.
> >>  -->
> >>  <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>
> >> @@ -26,120 +26,120 @@
> >>      <url>http://cwiki.apache.org/CXF</url>
> >>  
> >>      <parent>
> >> -        <groupId>org.apache.cxf</groupId>
> >> -        <artifactId>cxf-parent</artifactId>
> >> -        <version>2.0-incubator-RC-SNAPSHOT</version>
> >> -        <relativePath>../../parent/pom.xml</relativePath>
> >> +	<groupId>org.apache.cxf</groupId>
> >> +	<artifactId>cxf-parent</artifactId>
> >> +	<version>2.0-incubator-RC-SNAPSHOT</version>
> >> +	<relativePath>../../parent/pom.xml</relativePath>
> >>      </parent>
> >>  
> >> -     <dependencies>
> >> -            <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>velocity</groupId>
> >> -                <artifactId>velocity</artifactId>
> >> -            </dependency>
> >> -    
> >> -            <dependency>
> >> -                <groupId>wsdl4j</groupId>
> >> -                <artifactId>wsdl4j</artifactId>
> >> -            </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.soap</groupId>
> >> -                <artifactId>saaj-api</artifactId>
> >> -            </dependency>
> >> -    
> >> -            <dependency>
> >> -                <groupId>org.apache.geronimo.specs</groupId>
> >> -                
> <artifactId>geronimo-activation_1.1_spec</artifactId>
> >> -            </dependency>
> >> +    <dependencies>
> >> +	<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>velocity</groupId>
> >> +	    <artifactId>velocity</artifactId>
> >> +	</dependency>
> >> +	
> >> +	<dependency>
> >> +	    <groupId>wsdl4j</groupId>
> >> +	    <artifactId>wsdl4j</artifactId>
> >> +	</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.soap</groupId>
> >> +	    <artifactId>saaj-api</artifactId>
> >> +	</dependency>
> >> +	
> >> +	<dependency>
> >> +	    <groupId>org.apache.geronimo.specs</groupId>
> >> +	    <artifactId>geronimo-activation_1.1_spec</artifactId>
> >> +	</dependency>
> >>  
> >> -            <dependency>
> >> -                <groupId>org.apache.cxf</groupId>
> >> -                <artifactId>cxf-common-utilities</artifactId>
> >> -                <version>${project.version}</version>
> >> -            </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-api</artifactId>
> >> -	    	<version>${project.version}</version>
> >> -            </dependency>
> >> -            
> >> -        </dependencies>
> >> +	<dependency>
> >> +	    <groupId>org.apache.cxf</groupId>
> >> +	    <artifactId>cxf-common-utilities</artifactId>
> >> +	    <version>${project.version}</version>
> >> +	</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-api</artifactId>
> >> +	    <version>${project.version}</version>
> >> +	</dependency>
> >> +	
> >> +    </dependencies>
> >>  
> >>  
> >>      <scm>
> >> -        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools2/common</connection>
> >> -        
> >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> >> incubator/cxf/trunk/tools2/common</developerConnection>
> >> +	
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools2/common</connection>
> >> +	
> >> +<developerConnection>scm:svn:https://svn.apache.org/repos/asf
> >> /incubator
> >> +/cxf/trunk/tools2/common</developerConnection>
> >>      </scm>
> >>      
> >>      <build>
> >> -            <plugins>
> >> -                <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>
> >> -                                
> >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> >> -                                <xsdOptions>
> >> -                                    <xsdOption>
> >> -                                        
> >> 
> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
> >> -                                        
> >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
> >> nding.xjb</bindingFile>
> >> -                                        <deleteDirs>
> >> -                                            
> >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> >> e/cxf/wsdl</deleteDir>
> >> -                                        </deleteDirs>
> >> -                                    </xsdOption>
> >> -                                    
> >> -                                <xsdOption>
> >> -                                    
> >> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
> >> -                                    
> >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
> >> b</bindingFile>
> >> -                                    <deleteDirs>
> >> -                                        
> >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> >> e/cxf/wsdl</deleteDir>
> >> -                                    </deleteDirs>
> >> -                                </xsdOption>
> >> -                                    
> >> -                                </xsdOptions>
> >> -                            </configuration>
> >> -                            <goals>
> >> -                                <goal>xsdtojava</goal>
> >> -                            </goals>
> >> -                        </execution>
> >> -                    </executions>
> >> -                </plugin>
> >> -            </plugins>
> >> -     </build>    
> >> +	<plugins>
> >> +	    <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>
> >> +			    
> >> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> >> +			    <xsdOptions>
> >> +				<xsdOption>
> >> +				    
> >> 
> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
> >> +				    
> >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
> >> nding.xjb</bindingFile>
> >> +				    <deleteDirs>
> >> +					
> >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> >> e/cxf/wsdl</deleteDir>
> >> +				    </deleteDirs>
> >> +				</xsdOption>
> >> +				
> >> +				<xsdOption>
> >> +				    
> >> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
> >> +				    
> >> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
> >> b</bindingFile>
> >> +				    <deleteDirs>
> >> +					
> >> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> >> e/cxf/wsdl</deleteDir>
> >> +				    </deleteDirs>
> >> +				</xsdOption>
> >> +				
> >> +			    </xsdOptions>
> >> +			</configuration>
> >> +			<goals>
> >> +			    <goal>xsdtojava</goal>
> >> +			</goals>
> >> +		    </execution>
> >> +		</executions>
> >> +	    </plugin>
> >> +	</plugins>
> >> +    </build>    
> >>  
> >>  </project>
> >>
> >> Modified: incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
> >> e-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml Wed Mar 14 
> >> +++ 02:31:10 2007
> >> @@ -155,7 +155,7 @@
> >>              </plugin>
> >>              <plugin>
> >>                  <groupId>org.apache.cxf</groupId>
> >> -                <artifactId>cxf-codegen-plugin</artifactId>
> >> +                <artifactId>cxf-codegen-plugin2</artifactId>
> >>                  <version>${project.version}</version>
> >>                  <executions>
> >>                      <execution>
> >>
> >> Modified: incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
> >> e3.1-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml 
> Wed Mar 14 
> >> +++ 02:31:10 2007
> >> @@ -155,7 +155,7 @@
> >>              </plugin>
> >>              <plugin>
> >>                  <groupId>org.apache.cxf</groupId>
> >> -                <artifactId>cxf-codegen-plugin</artifactId>
> >> +                <artifactId>cxf-codegen-plugin2</artifactId>
> >>                  <version>${project.version}</version>
> >>                  <executions>
> >>                      <execution>
> >>
> >> Modified: incubator/cxf/trunk/tools2/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/pom.xm
> >> l?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -36,6 +36,7 @@
> >>          <module>validator</module>
> >>          <module>wsdlto</module>
> >>          <module>xjc</module>
> >> +        <module>javato</module>
> >>      </modules>
> >>  
> >>      <scm>
> >>
> >> Modified: incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto
> >> /misc/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml Wed Mar 14
> >> 02:31:10
> >> +++ 2007
> >> @@ -22,7 +22,7 @@
> >>      <artifactId>cxf-tools2-misctools</artifactId>
> >>      <packaging>jar</packaging>
> >>      <version>2.0-incubator-RC-SNAPSHOT</version>
> >> -    <name>Apache CXF Command Line Misctools</name>
> >> +    <name>Apache CXF Command Line Tools2 WSDLTo Misctools</name>
> >>      <url>http://cwiki.apache.org/CXF</url>
> >>  
> >>      <parent>
> >>
> >> Modified: incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
> >> -test/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml Wed Mar 14
> >> 02:31:10
> >> +++ 2007
> >> @@ -96,7 +96,7 @@
> >>                  <dependencies>
> >>                      <dependency>
> >>                          <groupId>org.apache.cxf</groupId>
> >> -                        <artifactId>cxf-tools-xjc-dv</artifactId>
> >> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
> >>                          <version>${project.version}</version>
> >>                      </dependency>
> >>                  </dependencies>
> >> @@ -106,8 +106,8 @@
> >>  
> >>  
> >>      <scm>
> >> -        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools/xjc/dv-test</connection>
> >> -        
> >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> >> incubator/cxf/trunk/tools/xjc/dv-test</developerConnection>
> >> +        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools2/xjc/dv-test</connection>
> >> +        
> >> + 
> >> 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubat
> >> o
> >> + r/cxf/trunk/tools2/xjc/dv-test</developerConnection>
> >>      </scm>
> >>  
> >>  </project>
> >>
> >> Modified: incubator/cxf/trunk/tools2/xjc/dv/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
> >> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/xjc/dv/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/xjc/dv/pom.xml Wed Mar 14 02:31:10 
> >> +++ 2007
> >> @@ -54,8 +54,8 @@
> >>  
> >>  
> >>      <scm>
> >> -        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools/xjc/dv</connection>
> >> -        
> >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> >> incubator/cxf/trunk/tools/xjc/dv</developerConnection>
> >> +        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools2/xjc/dv</connection>
> >> +        
> >> + 
> >> 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubat
> >> o
> >> + r/cxf/trunk/tools2/xjc/dv</developerConnection>
> >>      </scm>
> >>  
> >>  </project>
> >>
> >> Modified: incubator/cxf/trunk/tools2/xjc/pom.xml
> >> URL: 
> >> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/po
> >> m.xml?view=diff&rev=518082&r1=518081&r2=518082
> >> ==============================================================
> >> ================
> >> --- incubator/cxf/trunk/tools2/xjc/pom.xml (original)
> >> +++ incubator/cxf/trunk/tools2/xjc/pom.xml Wed Mar 14 02:31:10 2007
> >> @@ -38,8 +38,8 @@
> >>      </modules>
> >>  
> >>      <scm>
> >> -        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools/xjc</connection>
> >> -        
> >> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> >> incubator/cxf/trunk/tools/xjc</developerConnection>
> >> +        
> >> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> >> cxf/trunk/tools2/xjc</connection>
> >> +        
> >> + 
> >> 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubat
> >> o
> >> + r/cxf/trunk/tools2/xjc</developerConnection>
> >>      </scm>
> >>  
> >>  </project>
> >>
> >>
> >>
> >>     
> >
> >   
> 
> 

Re: svn commit: r518082 - in /incubator/cxf/trunk: ./ distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/ rt/databinding/jaxb/ rt/databinding/jaxb/src/main/resources/wsdl/ rt/databinding/jaxb/src/main/resources/wsdl/jaxb/ rt/management/ rt/ws/po

Posted by James Mao <ja...@iona.com>.
Hi Eoghan,

It should , can you try a mvn clean install. if it's not working,
Please clean all the artifacts in .m2/repository/org/apache/cxf/*
And try again

Sorry to introduce so many inconvenience :(

James.
> James,
>
> Since your update of the pom to pick up the cxf-tools2-* as opposed to
> cxf-tools-* I'm seeing a build failure as below.
>
> Have the tool2 artifacts actually been pushed up to the maven repo?
>
> /Eoghan
>
>
>
> [ERROR] BUILD ERROR
> [INFO]
> ------------------------------------------------------------------------
> [INFO] Failed to resolve artifact.
>
> Missing:
> ----------
> 1) org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT
>
>   Try downloading the file manually from the project website.
>
>   Then, install it using the command:
>       mvn install:install-file -DgroupId=org.apache.cxf
> -DartifactId=cxf-tools2-xjc-dv \
>           -Dversion=2.0-incubator-RC-SNAPSHOT -Dpackaging=jar
> -Dfile=/path/to/file
>
>   Path to dependency:
>         1)
> org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT
>         2)
> org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT
>
> ----------
> 1 required artifact is missing.
>
> for artifact:
>   org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT
>
> from the specified remote repositories:
>   central (http://repo1.maven.org/maven2)
>
>  
>
>   
>> -----Original Message-----
>> From: mmao@apache.org [mailto:mmao@apache.org] 
>> Sent: 14 March 2007 09:31
>> To: cxf-commits@incubator.apache.org
>> Subject: svn commit: r518082 - in /incubator/cxf/trunk: ./ 
>> distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/ 
>> rt/databinding/jaxb/ 
>> rt/databinding/jaxb/src/main/resources/wsdl/ 
>> rt/databinding/jaxb/src/main/resources/wsdl/jaxb/ 
>> rt/management/ rt/ws/pol...
>>
>> Author: mmao
>> Date: Wed Mar 14 02:31:10 2007
>> New Revision: 518082
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=518082
>> Log:
>> Fix build and pom updates
>>
>> * update all the pom to use tools2
>> * move misc_test.xsd to rt/databinding/jaxb, since it's only 
>> used in this module
>> * there is a bug in common/xsd plugin when loading jaxb 
>> plugins, we temporarily add the dependency in metacode module 
>> to solve the problem.
>>
>> Added:
>>     incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/
>>     
>> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/
>>     
>> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
>> l/jaxb/misc_test.xsd
>> Removed:
>>     incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb/
>> Modified:
>>     incubator/cxf/trunk/distribution/pom.xml
>>     incubator/cxf/trunk/integration/jca/pom.xml
>>     incubator/cxf/trunk/metacode/pom.xml
>>     incubator/cxf/trunk/pom.xml
>>     incubator/cxf/trunk/rt/bindings/xml/pom.xml
>>     incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
>>     incubator/cxf/trunk/rt/management/pom.xml
>>     incubator/cxf/trunk/rt/pom.xml
>>     incubator/cxf/trunk/rt/ws/policy/pom.xml
>>     incubator/cxf/trunk/testutils/pom.xml
>>     incubator/cxf/trunk/tools2/common/pom.xml
>>     incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
>>     incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
>>     incubator/cxf/trunk/tools2/pom.xml
>>     incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
>>     incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
>>     incubator/cxf/trunk/tools2/xjc/dv/pom.xml
>>     incubator/cxf/trunk/tools2/xjc/pom.xml
>>
>> Modified: incubator/cxf/trunk/distribution/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/
>> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/distribution/pom.xml (original)
>> +++ incubator/cxf/trunk/distribution/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -55,32 +55,27 @@
>>          </dependency>
>>          <dependency>
>>              <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-common</artifactId>
>> +            <artifactId>cxf-tools2-common</artifactId>
>>              <version>${pom.version}</version>
>>          </dependency>
>>          <dependency>
>>              <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-validator</artifactId>
>> +            <artifactId>cxf-tools2-validator</artifactId>
>>              <version>${pom.version}</version>
>>          </dependency>
>>          <dependency>
>>              <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-wsdl2java</artifactId>
>> +            <artifactId>cxf-tools2-wsdl2java</artifactId>
>>              <version>${pom.version}</version>
>>          </dependency>
>>          <dependency>
>>              <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-java2wsdl</artifactId>
>> +            <artifactId>cxf-tools2-java2wsdl</artifactId>
>>              <version>${pom.version}</version>
>>          </dependency>
>>          <dependency>
>>              <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-misctools</artifactId>
>> -            <version>${pom.version}</version>
>> -        </dependency>
>> -        <dependency>
>> -            <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-xjc-dv</artifactId>
>> +            <artifactId>cxf-tools2-xjc-dv</artifactId>
>>              <version>${pom.version}</version>
>>          </dependency>
>>  
>>
>> Modified: incubator/cxf/trunk/integration/jca/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/j
>> ca/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/integration/jca/pom.xml (original)
>> +++ incubator/cxf/trunk/integration/jca/pom.xml Wed Mar 14 
>> 02:31:10 2007
>> @@ -82,7 +82,7 @@
>>  
>>          <dependency>
>>              <groupId>org.apache.cxf</groupId>
>> -            <artifactId>cxf-tools-common</artifactId>
>> +            <artifactId>cxf-tools2-common</artifactId>
>>              <version>${project.version}</version>
>>          </dependency>
>>  
>>
>> Modified: incubator/cxf/trunk/metacode/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/pom.
>> xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/metacode/pom.xml (original)
>> +++ incubator/cxf/trunk/metacode/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -142,7 +142,13 @@
>>                          </goals>
>>                      </execution>
>>                  </executions>
>> +
>>                  <dependencies>
>> +                    <dependency>
>> +                        <groupId>org.apache.cxf</groupId>
>> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
>> +                        <version>${project.version}</version>
>> +                    </dependency>
>>                      <dependency>
>>                          <groupId>org.apache.cxf</groupId>
>>                          <artifactId>cxf-common-utilities</artifactId>
>>
>> Modified: incubator/cxf/trunk/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=
>> diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/pom.xml (original)
>> +++ incubator/cxf/trunk/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -125,13 +125,11 @@
>>          <module>parent</module>
>>          <module>common</module>
>>          <module>api</module>
>> -        <module>rt/core</module>       
>>          <module>metacode</module>
>>          <module>tools2</module>
>>          <module>codegen-plugin2</module>       
>>          <module>testutils</module>
>>          <module>rt</module>
>> -        <module>tools2/javato</module>
>>          <module>integration</module>
>>          <module>systests</module>
>>      </modules>
>>
>> Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/x
>> ml/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
>> +++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Wed Mar 14 
>> 02:31:10 2007
>> @@ -73,9 +73,9 @@
>>          </dependency>
>>          
>>           <dependency>
>> -	            <groupId>org.apache.cxf</groupId>
>> -	            <artifactId>cxf-tools2-common</artifactId>
>> -	            <version>${project.version}</version>
>> +	     <groupId>org.apache.cxf</groupId>
>> +	     <artifactId>cxf-tools2-common</artifactId>
>> +	     <version>${project.version}</version>
>>          </dependency>
>>         
>>          
>>
>> Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
>> g/jaxb/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
>> +++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Wed Mar 
>> 14 02:31:10 
>> +++ 2007
>> @@ -55,6 +55,28 @@
>>                      </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>
>> +                            
>> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
>> +                            <xsdOptions>
>> +                                <xsdOption>
>> +                                    
>> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
>> +                                </xsdOption>
>> +                            </xsdOptions>
>> +                        </configuration>
>> +                        <goals>
>> +                            <goal>xsdtojava</goal>
>> +                        </goals>
>> +                    </execution>
>> +                </executions>
>> +            </plugin>
>>          </plugins>
>>      </build>
>>  
>>
>> Added: 
>> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
>> l/jaxb/misc_test.xsd
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
>> g/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd?view=auto&rev=518082
>> ==============================================================
>> ================
>> --- 
>> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
>> l/jaxb/misc_test.xsd (added)
>> +++ 
>> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb
>> +++ /misc_test.xsd Wed Mar 14 02:31:10 2007
>> @@ -0,0 +1,10 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<schema xmlns="http://www.w3.org/2001/XMLSchema" 
>> targetNamespace="http://cxf.apache.org/jaxb_misc"
>> +    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
>> xmlns:tns="http://cxf.apache.org/jaxb_misc">
>> +    <xs:complexType name="Base64WithDefaultValueType">
>> +        <xs:sequence>
>> +            <xs:element name="EndPart" type="xs:string" />
>> +        </xs:sequence>
>> +        <xs:attribute name="AttributeWithDefaultValue" 
>> type="xs:base64Binary" default="1223" />
>> +    </xs:complexType>
>> +</schema>
>> \ No newline at end of file
>>
>> Modified: incubator/cxf/trunk/rt/management/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management
>> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/rt/management/pom.xml (original)
>> +++ incubator/cxf/trunk/rt/management/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -67,12 +67,6 @@
>>          </dependency>
>>          
>>          <dependency>
>> -	    <groupId>org.apache.cxf</groupId>
>> -	    <artifactId>cxf-tools2-xjc-dv</artifactId>
>> -	    <version>${project.version}</version>
>> -        </dependency>
>> -
>> -        <dependency>
>>              <groupId>org.easymock</groupId>
>>              <artifactId>easymockclassextension</artifactId>
>>              <scope>test</scope>
>>
>> Modified: incubator/cxf/trunk/rt/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?vi
>> ew=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/rt/pom.xml (original)
>> +++ incubator/cxf/trunk/rt/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -32,7 +32,7 @@
>>      </parent>
>>  
>>      <modules>
>> -        <module>management</module>
>> +        <module>core</module>
>>          <module>transports/local</module>
>>          <module>databinding/jaxb</module>
>>          <module>databinding/aegis</module>
>> @@ -46,6 +46,7 @@
>>          <module>ws/policy</module>
>>          <module>ws/addr</module>
>>          <module>ws/rm</module>
>> +        <module>management</module>
>>      </modules>
>>  
>>      <scm>
>>
>> Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/
>> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
>> +++ incubator/cxf/trunk/rt/ws/policy/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -116,7 +116,7 @@
>>              </plugin>
>>              <plugin>
>>                  <groupId>org.apache.cxf</groupId>
>> -                <artifactId>cxf-codegen-plugin</artifactId>
>> +                <artifactId>cxf-codegen-plugin2</artifactId>
>>                  <version>${project.version}</version>
>>                  <executions>
>>                      <execution>
>>
>> Modified: incubator/cxf/trunk/testutils/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom
>> .xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/testutils/pom.xml (original)
>> +++ incubator/cxf/trunk/testutils/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -143,41 +143,6 @@
>>              </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>
>> -                            
>> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
>> -                            <xsdOptions>
>> -                                <xsdOption>
>> -                                    
>> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
>> -                                </xsdOption>
>> -                            </xsdOptions>
>> -                        </configuration>
>> -                        <goals>
>> -                            <goal>xsdtojava</goal>
>> -                        </goals>
>> -                    </execution>
>> -                </executions>
>> -                <dependencies>
>> -		                    <dependency>
>> -		                        
>> <groupId>org.apache.cxf</groupId>
>> -		                        
>> <artifactId>cxf-tools2-xjc-dv</artifactId>
>> -		                        
>> <version>${project.version}</version>
>> -		                    </dependency>
>> -		                    <dependency>
>> -		                        
>> <groupId>org.apache.cxf</groupId>
>> -		                        
>> <artifactId>cxf-common-utilities</artifactId>
>> -		                        
>> <version>${project.version}</version>
>> -		                    </dependency>
>> -                </dependencies>
>> -                
>> -            </plugin>
>> -            <plugin>
>> -                <groupId>org.apache.cxf</groupId>
>>                  <artifactId>cxf-codegen-plugin2</artifactId>
>>                  <version>${project.version}</version>
>>                  <executions>
>> @@ -186,11 +151,6 @@
>>                          <phase>generate-sources</phase>
>>                          <configuration>
>>                              
>> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
>> -                            <xsdOptions>
>> -                                <xsdOption>
>> -                                    
>> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
>> -                                </xsdOption>
>> -                            </xsdOptions>
>>                              <wsdlOptions>
>>                                  <wsdlOption>
>>                                      
>> <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
>>
>> Modified: incubator/cxf/trunk/tools2/common/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common
>> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/common/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/common/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -1,20 +1,20 @@
>>  <!--
>> -  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
>> -  to you under the Apache License, Version 2.0 (the
>> -  "License"); you may not use this file except in compliance
>> -  with the License. You may obtain a copy of the License at
>> -
>> -  http://www.apache.org/licenses/LICENSE-2.0
>> -
>> -  Unless required by applicable law or agreed to in writing,
>> -  software distributed under the License is distributed on an
>> -  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> -  KIND, either express or implied. See the License for the
>> -  specific language governing permissions and limitations
>> -  under the License.
>> +    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
>> +    to you under the Apache License, Version 2.0 (the
>> +    "License"); you may not use this file except in compliance
>> +    with the License. You may obtain a copy of the License at
>> +    
>> +    http://www.apache.org/licenses/LICENSE-2.0
>> +    
>> +    Unless required by applicable law or agreed to in writing,
>> +    software distributed under the License is distributed on an
>> +    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> +    KIND, either express or implied. See the License for the
>> +    specific language governing permissions and limitations
>> +    under the License.
>>  -->
>>  <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>
>> @@ -26,120 +26,120 @@
>>      <url>http://cwiki.apache.org/CXF</url>
>>  
>>      <parent>
>> -        <groupId>org.apache.cxf</groupId>
>> -        <artifactId>cxf-parent</artifactId>
>> -        <version>2.0-incubator-RC-SNAPSHOT</version>
>> -        <relativePath>../../parent/pom.xml</relativePath>
>> +	<groupId>org.apache.cxf</groupId>
>> +	<artifactId>cxf-parent</artifactId>
>> +	<version>2.0-incubator-RC-SNAPSHOT</version>
>> +	<relativePath>../../parent/pom.xml</relativePath>
>>      </parent>
>>  
>> -     <dependencies>
>> -            <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>velocity</groupId>
>> -                <artifactId>velocity</artifactId>
>> -            </dependency>
>> -    
>> -            <dependency>
>> -                <groupId>wsdl4j</groupId>
>> -                <artifactId>wsdl4j</artifactId>
>> -            </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.soap</groupId>
>> -                <artifactId>saaj-api</artifactId>
>> -            </dependency>
>> -    
>> -            <dependency>
>> -                <groupId>org.apache.geronimo.specs</groupId>
>> -                <artifactId>geronimo-activation_1.1_spec</artifactId>
>> -            </dependency>
>> +    <dependencies>
>> +	<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>velocity</groupId>
>> +	    <artifactId>velocity</artifactId>
>> +	</dependency>
>> +	
>> +	<dependency>
>> +	    <groupId>wsdl4j</groupId>
>> +	    <artifactId>wsdl4j</artifactId>
>> +	</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.soap</groupId>
>> +	    <artifactId>saaj-api</artifactId>
>> +	</dependency>
>> +	
>> +	<dependency>
>> +	    <groupId>org.apache.geronimo.specs</groupId>
>> +	    <artifactId>geronimo-activation_1.1_spec</artifactId>
>> +	</dependency>
>>  
>> -            <dependency>
>> -                <groupId>org.apache.cxf</groupId>
>> -                <artifactId>cxf-common-utilities</artifactId>
>> -                <version>${project.version}</version>
>> -            </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-api</artifactId>
>> -	    	<version>${project.version}</version>
>> -            </dependency>
>> -            
>> -        </dependencies>
>> +	<dependency>
>> +	    <groupId>org.apache.cxf</groupId>
>> +	    <artifactId>cxf-common-utilities</artifactId>
>> +	    <version>${project.version}</version>
>> +	</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-api</artifactId>
>> +	    <version>${project.version}</version>
>> +	</dependency>
>> +	
>> +    </dependencies>
>>  
>>  
>>      <scm>
>> -        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools2/common</connection>
>> -        
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
>> incubator/cxf/trunk/tools2/common</developerConnection>
>> +	
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools2/common</connection>
>> +	
>> +<developerConnection>scm:svn:https://svn.apache.org/repos/asf
>> /incubator
>> +/cxf/trunk/tools2/common</developerConnection>
>>      </scm>
>>      
>>      <build>
>> -            <plugins>
>> -                <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>
>> -                                
>> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
>> -                                <xsdOptions>
>> -                                    <xsdOption>
>> -                                        
>> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
>> -                                        
>> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
>> nding.xjb</bindingFile>
>> -                                        <deleteDirs>
>> -                                            
>> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
>> e/cxf/wsdl</deleteDir>
>> -                                        </deleteDirs>
>> -                                    </xsdOption>
>> -                                    
>> -                                <xsdOption>
>> -                                    
>> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
>> -                                    
>> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
>> b</bindingFile>
>> -                                    <deleteDirs>
>> -                                        
>> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
>> e/cxf/wsdl</deleteDir>
>> -                                    </deleteDirs>
>> -                                </xsdOption>
>> -                                    
>> -                                </xsdOptions>
>> -                            </configuration>
>> -                            <goals>
>> -                                <goal>xsdtojava</goal>
>> -                            </goals>
>> -                        </execution>
>> -                    </executions>
>> -                </plugin>
>> -            </plugins>
>> -     </build>    
>> +	<plugins>
>> +	    <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>
>> +			    
>> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
>> +			    <xsdOptions>
>> +				<xsdOption>
>> +				    
>> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
>> +				    
>> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
>> nding.xjb</bindingFile>
>> +				    <deleteDirs>
>> +					
>> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
>> e/cxf/wsdl</deleteDir>
>> +				    </deleteDirs>
>> +				</xsdOption>
>> +				
>> +				<xsdOption>
>> +				    
>> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
>> +				    
>> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
>> b</bindingFile>
>> +				    <deleteDirs>
>> +					
>> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
>> e/cxf/wsdl</deleteDir>
>> +				    </deleteDirs>
>> +				</xsdOption>
>> +				
>> +			    </xsdOptions>
>> +			</configuration>
>> +			<goals>
>> +			    <goal>xsdtojava</goal>
>> +			</goals>
>> +		    </execution>
>> +		</executions>
>> +	    </plugin>
>> +	</plugins>
>> +    </build>    
>>  
>>  </project>
>>
>> Modified: incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
>> e-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml Wed Mar 14 
>> +++ 02:31:10 2007
>> @@ -155,7 +155,7 @@
>>              </plugin>
>>              <plugin>
>>                  <groupId>org.apache.cxf</groupId>
>> -                <artifactId>cxf-codegen-plugin</artifactId>
>> +                <artifactId>cxf-codegen-plugin2</artifactId>
>>                  <version>${project.version}</version>
>>                  <executions>
>>                      <execution>
>>
>> Modified: incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
>> e3.1-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml Wed Mar 14 
>> +++ 02:31:10 2007
>> @@ -155,7 +155,7 @@
>>              </plugin>
>>              <plugin>
>>                  <groupId>org.apache.cxf</groupId>
>> -                <artifactId>cxf-codegen-plugin</artifactId>
>> +                <artifactId>cxf-codegen-plugin2</artifactId>
>>                  <version>${project.version}</version>
>>                  <executions>
>>                      <execution>
>>
>> Modified: incubator/cxf/trunk/tools2/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/pom.xm
>> l?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -36,6 +36,7 @@
>>          <module>validator</module>
>>          <module>wsdlto</module>
>>          <module>xjc</module>
>> +        <module>javato</module>
>>      </modules>
>>  
>>      <scm>
>>
>> Modified: incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto
>> /misc/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml Wed Mar 14 
>> 02:31:10 
>> +++ 2007
>> @@ -22,7 +22,7 @@
>>      <artifactId>cxf-tools2-misctools</artifactId>
>>      <packaging>jar</packaging>
>>      <version>2.0-incubator-RC-SNAPSHOT</version>
>> -    <name>Apache CXF Command Line Misctools</name>
>> +    <name>Apache CXF Command Line Tools2 WSDLTo Misctools</name>
>>      <url>http://cwiki.apache.org/CXF</url>
>>  
>>      <parent>
>>
>> Modified: incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
>> -test/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml Wed Mar 14 
>> 02:31:10 
>> +++ 2007
>> @@ -96,7 +96,7 @@
>>                  <dependencies>
>>                      <dependency>
>>                          <groupId>org.apache.cxf</groupId>
>> -                        <artifactId>cxf-tools-xjc-dv</artifactId>
>> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
>>                          <version>${project.version}</version>
>>                      </dependency>
>>                  </dependencies>
>> @@ -106,8 +106,8 @@
>>  
>>  
>>      <scm>
>> -        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools/xjc/dv-test</connection>
>> -        
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
>> incubator/cxf/trunk/tools/xjc/dv-test</developerConnection>
>> +        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools2/xjc/dv-test</connection>
>> +        
>> + 
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
>> + r/cxf/trunk/tools2/xjc/dv-test</developerConnection>
>>      </scm>
>>  
>>  </project>
>>
>> Modified: incubator/cxf/trunk/tools2/xjc/dv/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
>> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/xjc/dv/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/xjc/dv/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -54,8 +54,8 @@
>>  
>>  
>>      <scm>
>> -        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools/xjc/dv</connection>
>> -        
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
>> incubator/cxf/trunk/tools/xjc/dv</developerConnection>
>> +        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools2/xjc/dv</connection>
>> +        
>> + 
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
>> + r/cxf/trunk/tools2/xjc/dv</developerConnection>
>>      </scm>
>>  
>>  </project>
>>
>> Modified: incubator/cxf/trunk/tools2/xjc/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/po
>> m.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/xjc/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/xjc/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -38,8 +38,8 @@
>>      </modules>
>>  
>>      <scm>
>> -        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools/xjc</connection>
>> -        
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
>> incubator/cxf/trunk/tools/xjc</developerConnection>
>> +        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools2/xjc</connection>
>> +        
>> + 
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
>> + r/cxf/trunk/tools2/xjc</developerConnection>
>>      </scm>
>>  
>>  </project>
>>
>>
>>
>>     
>
>   


Re: svn commit: r518082 - in /incubator/cxf/trunk: ./ distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/ rt/databinding/jaxb/ rt/databinding/jaxb/src/main/resources/wsdl/ rt/databinding/jaxb/src/main/resources/wsdl/jaxb/ rt/management/ rt/ws/po

Posted by James Mao <ja...@iona.com>.
Hi Eoghan,

It should , can you try a mvn clean install. if it's not working,
Please clean all the artifacts in .m2/repository/org/apache/cxf/*
And try again

Sorry to introduce so many inconvenience :(

James.
> James,
>
> Since your update of the pom to pick up the cxf-tools2-* as opposed to
> cxf-tools-* I'm seeing a build failure as below.
>
> Have the tool2 artifacts actually been pushed up to the maven repo?
>
> /Eoghan
>
>
>
> [ERROR] BUILD ERROR
> [INFO]
> ------------------------------------------------------------------------
> [INFO] Failed to resolve artifact.
>
> Missing:
> ----------
> 1) org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT
>
>   Try downloading the file manually from the project website.
>
>   Then, install it using the command:
>       mvn install:install-file -DgroupId=org.apache.cxf
> -DartifactId=cxf-tools2-xjc-dv \
>           -Dversion=2.0-incubator-RC-SNAPSHOT -Dpackaging=jar
> -Dfile=/path/to/file
>
>   Path to dependency:
>         1)
> org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT
>         2)
> org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT
>
> ----------
> 1 required artifact is missing.
>
> for artifact:
>   org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT
>
> from the specified remote repositories:
>   central (http://repo1.maven.org/maven2)
>
>  
>
>   
>> -----Original Message-----
>> From: mmao@apache.org [mailto:mmao@apache.org] 
>> Sent: 14 March 2007 09:31
>> To: cxf-commits@incubator.apache.org
>> Subject: svn commit: r518082 - in /incubator/cxf/trunk: ./ 
>> distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/ 
>> rt/databinding/jaxb/ 
>> rt/databinding/jaxb/src/main/resources/wsdl/ 
>> rt/databinding/jaxb/src/main/resources/wsdl/jaxb/ 
>> rt/management/ rt/ws/pol...
>>
>> Author: mmao
>> Date: Wed Mar 14 02:31:10 2007
>> New Revision: 518082
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=518082
>> Log:
>> Fix build and pom updates
>>
>> * update all the pom to use tools2
>> * move misc_test.xsd to rt/databinding/jaxb, since it's only 
>> used in this module
>> * there is a bug in common/xsd plugin when loading jaxb 
>> plugins, we temporarily add the dependency in metacode module 
>> to solve the problem.
>>
>> Added:
>>     incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/
>>     
>> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/
>>     
>> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
>> l/jaxb/misc_test.xsd
>> Removed:
>>     incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb/
>> Modified:
>>     incubator/cxf/trunk/distribution/pom.xml
>>     incubator/cxf/trunk/integration/jca/pom.xml
>>     incubator/cxf/trunk/metacode/pom.xml
>>     incubator/cxf/trunk/pom.xml
>>     incubator/cxf/trunk/rt/bindings/xml/pom.xml
>>     incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
>>     incubator/cxf/trunk/rt/management/pom.xml
>>     incubator/cxf/trunk/rt/pom.xml
>>     incubator/cxf/trunk/rt/ws/policy/pom.xml
>>     incubator/cxf/trunk/testutils/pom.xml
>>     incubator/cxf/trunk/tools2/common/pom.xml
>>     incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
>>     incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
>>     incubator/cxf/trunk/tools2/pom.xml
>>     incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
>>     incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
>>     incubator/cxf/trunk/tools2/xjc/dv/pom.xml
>>     incubator/cxf/trunk/tools2/xjc/pom.xml
>>
>> Modified: incubator/cxf/trunk/distribution/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/
>> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/distribution/pom.xml (original)
>> +++ incubator/cxf/trunk/distribution/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -55,32 +55,27 @@
>>          </dependency>
>>          <dependency>
>>              <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-common</artifactId>
>> +            <artifactId>cxf-tools2-common</artifactId>
>>              <version>${pom.version}</version>
>>          </dependency>
>>          <dependency>
>>              <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-validator</artifactId>
>> +            <artifactId>cxf-tools2-validator</artifactId>
>>              <version>${pom.version}</version>
>>          </dependency>
>>          <dependency>
>>              <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-wsdl2java</artifactId>
>> +            <artifactId>cxf-tools2-wsdl2java</artifactId>
>>              <version>${pom.version}</version>
>>          </dependency>
>>          <dependency>
>>              <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-java2wsdl</artifactId>
>> +            <artifactId>cxf-tools2-java2wsdl</artifactId>
>>              <version>${pom.version}</version>
>>          </dependency>
>>          <dependency>
>>              <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-misctools</artifactId>
>> -            <version>${pom.version}</version>
>> -        </dependency>
>> -        <dependency>
>> -            <groupId>${pom.groupId}</groupId>
>> -            <artifactId>cxf-tools-xjc-dv</artifactId>
>> +            <artifactId>cxf-tools2-xjc-dv</artifactId>
>>              <version>${pom.version}</version>
>>          </dependency>
>>  
>>
>> Modified: incubator/cxf/trunk/integration/jca/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/j
>> ca/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/integration/jca/pom.xml (original)
>> +++ incubator/cxf/trunk/integration/jca/pom.xml Wed Mar 14 
>> 02:31:10 2007
>> @@ -82,7 +82,7 @@
>>  
>>          <dependency>
>>              <groupId>org.apache.cxf</groupId>
>> -            <artifactId>cxf-tools-common</artifactId>
>> +            <artifactId>cxf-tools2-common</artifactId>
>>              <version>${project.version}</version>
>>          </dependency>
>>  
>>
>> Modified: incubator/cxf/trunk/metacode/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/pom.
>> xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/metacode/pom.xml (original)
>> +++ incubator/cxf/trunk/metacode/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -142,7 +142,13 @@
>>                          </goals>
>>                      </execution>
>>                  </executions>
>> +
>>                  <dependencies>
>> +                    <dependency>
>> +                        <groupId>org.apache.cxf</groupId>
>> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
>> +                        <version>${project.version}</version>
>> +                    </dependency>
>>                      <dependency>
>>                          <groupId>org.apache.cxf</groupId>
>>                          <artifactId>cxf-common-utilities</artifactId>
>>
>> Modified: incubator/cxf/trunk/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=
>> diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/pom.xml (original)
>> +++ incubator/cxf/trunk/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -125,13 +125,11 @@
>>          <module>parent</module>
>>          <module>common</module>
>>          <module>api</module>
>> -        <module>rt/core</module>       
>>          <module>metacode</module>
>>          <module>tools2</module>
>>          <module>codegen-plugin2</module>       
>>          <module>testutils</module>
>>          <module>rt</module>
>> -        <module>tools2/javato</module>
>>          <module>integration</module>
>>          <module>systests</module>
>>      </modules>
>>
>> Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/x
>> ml/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
>> +++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Wed Mar 14 
>> 02:31:10 2007
>> @@ -73,9 +73,9 @@
>>          </dependency>
>>          
>>           <dependency>
>> -	            <groupId>org.apache.cxf</groupId>
>> -	            <artifactId>cxf-tools2-common</artifactId>
>> -	            <version>${project.version}</version>
>> +	     <groupId>org.apache.cxf</groupId>
>> +	     <artifactId>cxf-tools2-common</artifactId>
>> +	     <version>${project.version}</version>
>>          </dependency>
>>         
>>          
>>
>> Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
>> g/jaxb/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
>> +++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Wed Mar 
>> 14 02:31:10 
>> +++ 2007
>> @@ -55,6 +55,28 @@
>>                      </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>
>> +                            
>> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
>> +                            <xsdOptions>
>> +                                <xsdOption>
>> +                                    
>> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
>> +                                </xsdOption>
>> +                            </xsdOptions>
>> +                        </configuration>
>> +                        <goals>
>> +                            <goal>xsdtojava</goal>
>> +                        </goals>
>> +                    </execution>
>> +                </executions>
>> +            </plugin>
>>          </plugins>
>>      </build>
>>  
>>
>> Added: 
>> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
>> l/jaxb/misc_test.xsd
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
>> g/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd?view=auto&rev=518082
>> ==============================================================
>> ================
>> --- 
>> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
>> l/jaxb/misc_test.xsd (added)
>> +++ 
>> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb
>> +++ /misc_test.xsd Wed Mar 14 02:31:10 2007
>> @@ -0,0 +1,10 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<schema xmlns="http://www.w3.org/2001/XMLSchema" 
>> targetNamespace="http://cxf.apache.org/jaxb_misc"
>> +    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
>> xmlns:tns="http://cxf.apache.org/jaxb_misc">
>> +    <xs:complexType name="Base64WithDefaultValueType">
>> +        <xs:sequence>
>> +            <xs:element name="EndPart" type="xs:string" />
>> +        </xs:sequence>
>> +        <xs:attribute name="AttributeWithDefaultValue" 
>> type="xs:base64Binary" default="1223" />
>> +    </xs:complexType>
>> +</schema>
>> \ No newline at end of file
>>
>> Modified: incubator/cxf/trunk/rt/management/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management
>> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/rt/management/pom.xml (original)
>> +++ incubator/cxf/trunk/rt/management/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -67,12 +67,6 @@
>>          </dependency>
>>          
>>          <dependency>
>> -	    <groupId>org.apache.cxf</groupId>
>> -	    <artifactId>cxf-tools2-xjc-dv</artifactId>
>> -	    <version>${project.version}</version>
>> -        </dependency>
>> -
>> -        <dependency>
>>              <groupId>org.easymock</groupId>
>>              <artifactId>easymockclassextension</artifactId>
>>              <scope>test</scope>
>>
>> Modified: incubator/cxf/trunk/rt/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?vi
>> ew=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/rt/pom.xml (original)
>> +++ incubator/cxf/trunk/rt/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -32,7 +32,7 @@
>>      </parent>
>>  
>>      <modules>
>> -        <module>management</module>
>> +        <module>core</module>
>>          <module>transports/local</module>
>>          <module>databinding/jaxb</module>
>>          <module>databinding/aegis</module>
>> @@ -46,6 +46,7 @@
>>          <module>ws/policy</module>
>>          <module>ws/addr</module>
>>          <module>ws/rm</module>
>> +        <module>management</module>
>>      </modules>
>>  
>>      <scm>
>>
>> Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/
>> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
>> +++ incubator/cxf/trunk/rt/ws/policy/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -116,7 +116,7 @@
>>              </plugin>
>>              <plugin>
>>                  <groupId>org.apache.cxf</groupId>
>> -                <artifactId>cxf-codegen-plugin</artifactId>
>> +                <artifactId>cxf-codegen-plugin2</artifactId>
>>                  <version>${project.version}</version>
>>                  <executions>
>>                      <execution>
>>
>> Modified: incubator/cxf/trunk/testutils/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom
>> .xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/testutils/pom.xml (original)
>> +++ incubator/cxf/trunk/testutils/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -143,41 +143,6 @@
>>              </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>
>> -                            
>> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
>> -                            <xsdOptions>
>> -                                <xsdOption>
>> -                                    
>> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
>> -                                </xsdOption>
>> -                            </xsdOptions>
>> -                        </configuration>
>> -                        <goals>
>> -                            <goal>xsdtojava</goal>
>> -                        </goals>
>> -                    </execution>
>> -                </executions>
>> -                <dependencies>
>> -		                    <dependency>
>> -		                        
>> <groupId>org.apache.cxf</groupId>
>> -		                        
>> <artifactId>cxf-tools2-xjc-dv</artifactId>
>> -		                        
>> <version>${project.version}</version>
>> -		                    </dependency>
>> -		                    <dependency>
>> -		                        
>> <groupId>org.apache.cxf</groupId>
>> -		                        
>> <artifactId>cxf-common-utilities</artifactId>
>> -		                        
>> <version>${project.version}</version>
>> -		                    </dependency>
>> -                </dependencies>
>> -                
>> -            </plugin>
>> -            <plugin>
>> -                <groupId>org.apache.cxf</groupId>
>>                  <artifactId>cxf-codegen-plugin2</artifactId>
>>                  <version>${project.version}</version>
>>                  <executions>
>> @@ -186,11 +151,6 @@
>>                          <phase>generate-sources</phase>
>>                          <configuration>
>>                              
>> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
>> -                            <xsdOptions>
>> -                                <xsdOption>
>> -                                    
>> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
>> -                                </xsdOption>
>> -                            </xsdOptions>
>>                              <wsdlOptions>
>>                                  <wsdlOption>
>>                                      
>> <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
>>
>> Modified: incubator/cxf/trunk/tools2/common/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common
>> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/common/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/common/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -1,20 +1,20 @@
>>  <!--
>> -  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
>> -  to you under the Apache License, Version 2.0 (the
>> -  "License"); you may not use this file except in compliance
>> -  with the License. You may obtain a copy of the License at
>> -
>> -  http://www.apache.org/licenses/LICENSE-2.0
>> -
>> -  Unless required by applicable law or agreed to in writing,
>> -  software distributed under the License is distributed on an
>> -  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> -  KIND, either express or implied. See the License for the
>> -  specific language governing permissions and limitations
>> -  under the License.
>> +    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
>> +    to you under the Apache License, Version 2.0 (the
>> +    "License"); you may not use this file except in compliance
>> +    with the License. You may obtain a copy of the License at
>> +    
>> +    http://www.apache.org/licenses/LICENSE-2.0
>> +    
>> +    Unless required by applicable law or agreed to in writing,
>> +    software distributed under the License is distributed on an
>> +    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> +    KIND, either express or implied. See the License for the
>> +    specific language governing permissions and limitations
>> +    under the License.
>>  -->
>>  <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>
>> @@ -26,120 +26,120 @@
>>      <url>http://cwiki.apache.org/CXF</url>
>>  
>>      <parent>
>> -        <groupId>org.apache.cxf</groupId>
>> -        <artifactId>cxf-parent</artifactId>
>> -        <version>2.0-incubator-RC-SNAPSHOT</version>
>> -        <relativePath>../../parent/pom.xml</relativePath>
>> +	<groupId>org.apache.cxf</groupId>
>> +	<artifactId>cxf-parent</artifactId>
>> +	<version>2.0-incubator-RC-SNAPSHOT</version>
>> +	<relativePath>../../parent/pom.xml</relativePath>
>>      </parent>
>>  
>> -     <dependencies>
>> -            <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>velocity</groupId>
>> -                <artifactId>velocity</artifactId>
>> -            </dependency>
>> -    
>> -            <dependency>
>> -                <groupId>wsdl4j</groupId>
>> -                <artifactId>wsdl4j</artifactId>
>> -            </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.soap</groupId>
>> -                <artifactId>saaj-api</artifactId>
>> -            </dependency>
>> -    
>> -            <dependency>
>> -                <groupId>org.apache.geronimo.specs</groupId>
>> -                <artifactId>geronimo-activation_1.1_spec</artifactId>
>> -            </dependency>
>> +    <dependencies>
>> +	<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>velocity</groupId>
>> +	    <artifactId>velocity</artifactId>
>> +	</dependency>
>> +	
>> +	<dependency>
>> +	    <groupId>wsdl4j</groupId>
>> +	    <artifactId>wsdl4j</artifactId>
>> +	</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.soap</groupId>
>> +	    <artifactId>saaj-api</artifactId>
>> +	</dependency>
>> +	
>> +	<dependency>
>> +	    <groupId>org.apache.geronimo.specs</groupId>
>> +	    <artifactId>geronimo-activation_1.1_spec</artifactId>
>> +	</dependency>
>>  
>> -            <dependency>
>> -                <groupId>org.apache.cxf</groupId>
>> -                <artifactId>cxf-common-utilities</artifactId>
>> -                <version>${project.version}</version>
>> -            </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-api</artifactId>
>> -	    	<version>${project.version}</version>
>> -            </dependency>
>> -            
>> -        </dependencies>
>> +	<dependency>
>> +	    <groupId>org.apache.cxf</groupId>
>> +	    <artifactId>cxf-common-utilities</artifactId>
>> +	    <version>${project.version}</version>
>> +	</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-api</artifactId>
>> +	    <version>${project.version}</version>
>> +	</dependency>
>> +	
>> +    </dependencies>
>>  
>>  
>>      <scm>
>> -        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools2/common</connection>
>> -        
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
>> incubator/cxf/trunk/tools2/common</developerConnection>
>> +	
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools2/common</connection>
>> +	
>> +<developerConnection>scm:svn:https://svn.apache.org/repos/asf
>> /incubator
>> +/cxf/trunk/tools2/common</developerConnection>
>>      </scm>
>>      
>>      <build>
>> -            <plugins>
>> -                <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>
>> -                                
>> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
>> -                                <xsdOptions>
>> -                                    <xsdOption>
>> -                                        
>> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
>> -                                        
>> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
>> nding.xjb</bindingFile>
>> -                                        <deleteDirs>
>> -                                            
>> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
>> e/cxf/wsdl</deleteDir>
>> -                                        </deleteDirs>
>> -                                    </xsdOption>
>> -                                    
>> -                                <xsdOption>
>> -                                    
>> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
>> -                                    
>> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
>> b</bindingFile>
>> -                                    <deleteDirs>
>> -                                        
>> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
>> e/cxf/wsdl</deleteDir>
>> -                                    </deleteDirs>
>> -                                </xsdOption>
>> -                                    
>> -                                </xsdOptions>
>> -                            </configuration>
>> -                            <goals>
>> -                                <goal>xsdtojava</goal>
>> -                            </goals>
>> -                        </execution>
>> -                    </executions>
>> -                </plugin>
>> -            </plugins>
>> -     </build>    
>> +	<plugins>
>> +	    <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>
>> +			    
>> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
>> +			    <xsdOptions>
>> +				<xsdOption>
>> +				    
>> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
>> +				    
>> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
>> nding.xjb</bindingFile>
>> +				    <deleteDirs>
>> +					
>> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
>> e/cxf/wsdl</deleteDir>
>> +				    </deleteDirs>
>> +				</xsdOption>
>> +				
>> +				<xsdOption>
>> +				    
>> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
>> +				    
>> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
>> b</bindingFile>
>> +				    <deleteDirs>
>> +					
>> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
>> e/cxf/wsdl</deleteDir>
>> +				    </deleteDirs>
>> +				</xsdOption>
>> +				
>> +			    </xsdOptions>
>> +			</configuration>
>> +			<goals>
>> +			    <goal>xsdtojava</goal>
>> +			</goals>
>> +		    </execution>
>> +		</executions>
>> +	    </plugin>
>> +	</plugins>
>> +    </build>    
>>  
>>  </project>
>>
>> Modified: incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
>> e-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml Wed Mar 14 
>> +++ 02:31:10 2007
>> @@ -155,7 +155,7 @@
>>              </plugin>
>>              <plugin>
>>                  <groupId>org.apache.cxf</groupId>
>> -                <artifactId>cxf-codegen-plugin</artifactId>
>> +                <artifactId>cxf-codegen-plugin2</artifactId>
>>                  <version>${project.version}</version>
>>                  <executions>
>>                      <execution>
>>
>> Modified: incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
>> e3.1-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml Wed Mar 14 
>> +++ 02:31:10 2007
>> @@ -155,7 +155,7 @@
>>              </plugin>
>>              <plugin>
>>                  <groupId>org.apache.cxf</groupId>
>> -                <artifactId>cxf-codegen-plugin</artifactId>
>> +                <artifactId>cxf-codegen-plugin2</artifactId>
>>                  <version>${project.version}</version>
>>                  <executions>
>>                      <execution>
>>
>> Modified: incubator/cxf/trunk/tools2/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/pom.xm
>> l?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -36,6 +36,7 @@
>>          <module>validator</module>
>>          <module>wsdlto</module>
>>          <module>xjc</module>
>> +        <module>javato</module>
>>      </modules>
>>  
>>      <scm>
>>
>> Modified: incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto
>> /misc/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml Wed Mar 14 
>> 02:31:10 
>> +++ 2007
>> @@ -22,7 +22,7 @@
>>      <artifactId>cxf-tools2-misctools</artifactId>
>>      <packaging>jar</packaging>
>>      <version>2.0-incubator-RC-SNAPSHOT</version>
>> -    <name>Apache CXF Command Line Misctools</name>
>> +    <name>Apache CXF Command Line Tools2 WSDLTo Misctools</name>
>>      <url>http://cwiki.apache.org/CXF</url>
>>  
>>      <parent>
>>
>> Modified: incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
>> -test/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml Wed Mar 14 
>> 02:31:10 
>> +++ 2007
>> @@ -96,7 +96,7 @@
>>                  <dependencies>
>>                      <dependency>
>>                          <groupId>org.apache.cxf</groupId>
>> -                        <artifactId>cxf-tools-xjc-dv</artifactId>
>> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
>>                          <version>${project.version}</version>
>>                      </dependency>
>>                  </dependencies>
>> @@ -106,8 +106,8 @@
>>  
>>  
>>      <scm>
>> -        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools/xjc/dv-test</connection>
>> -        
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
>> incubator/cxf/trunk/tools/xjc/dv-test</developerConnection>
>> +        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools2/xjc/dv-test</connection>
>> +        
>> + 
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
>> + r/cxf/trunk/tools2/xjc/dv-test</developerConnection>
>>      </scm>
>>  
>>  </project>
>>
>> Modified: incubator/cxf/trunk/tools2/xjc/dv/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
>> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/xjc/dv/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/xjc/dv/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -54,8 +54,8 @@
>>  
>>  
>>      <scm>
>> -        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools/xjc/dv</connection>
>> -        
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
>> incubator/cxf/trunk/tools/xjc/dv</developerConnection>
>> +        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools2/xjc/dv</connection>
>> +        
>> + 
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
>> + r/cxf/trunk/tools2/xjc/dv</developerConnection>
>>      </scm>
>>  
>>  </project>
>>
>> Modified: incubator/cxf/trunk/tools2/xjc/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/po
>> m.xml?view=diff&rev=518082&r1=518081&r2=518082
>> ==============================================================
>> ================
>> --- incubator/cxf/trunk/tools2/xjc/pom.xml (original)
>> +++ incubator/cxf/trunk/tools2/xjc/pom.xml Wed Mar 14 02:31:10 2007
>> @@ -38,8 +38,8 @@
>>      </modules>
>>  
>>      <scm>
>> -        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools/xjc</connection>
>> -        
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
>> incubator/cxf/trunk/tools/xjc</developerConnection>
>> +        
>> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
>> cxf/trunk/tools2/xjc</connection>
>> +        
>> + 
>> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
>> + r/cxf/trunk/tools2/xjc</developerConnection>
>>      </scm>
>>  
>>  </project>
>>
>>
>>
>>     
>
>   


RE: svn commit: r518082 - in /incubator/cxf/trunk: ./ distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/ rt/databinding/jaxb/ rt/databinding/jaxb/src/main/resources/wsdl/ rt/databinding/jaxb/src/main/resources/wsdl/jaxb/ rt/management/ rt/ws/po

Posted by "Glynn, Eoghan" <eo...@iona.com>.

James,

Since your update of the pom to pick up the cxf-tools2-* as opposed to
cxf-tools-* I'm seeing a build failure as below.

Have the tool2 artifacts actually been pushed up to the maven repo?

/Eoghan



[ERROR] BUILD ERROR
[INFO]
------------------------------------------------------------------------
[INFO] Failed to resolve artifact.

Missing:
----------
1) org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT

  Try downloading the file manually from the project website.

  Then, install it using the command:
      mvn install:install-file -DgroupId=org.apache.cxf
-DartifactId=cxf-tools2-xjc-dv \
          -Dversion=2.0-incubator-RC-SNAPSHOT -Dpackaging=jar
-Dfile=/path/to/file

  Path to dependency:
        1)
org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT
        2)
org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT

----------
1 required artifact is missing.

for artifact:
  org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT

from the specified remote repositories:
  central (http://repo1.maven.org/maven2)

 

> -----Original Message-----
> From: mmao@apache.org [mailto:mmao@apache.org] 
> Sent: 14 March 2007 09:31
> To: cxf-commits@incubator.apache.org
> Subject: svn commit: r518082 - in /incubator/cxf/trunk: ./ 
> distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/ 
> rt/databinding/jaxb/ 
> rt/databinding/jaxb/src/main/resources/wsdl/ 
> rt/databinding/jaxb/src/main/resources/wsdl/jaxb/ 
> rt/management/ rt/ws/pol...
> 
> Author: mmao
> Date: Wed Mar 14 02:31:10 2007
> New Revision: 518082
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=518082
> Log:
> Fix build and pom updates
> 
> * update all the pom to use tools2
> * move misc_test.xsd to rt/databinding/jaxb, since it's only 
> used in this module
> * there is a bug in common/xsd plugin when loading jaxb 
> plugins, we temporarily add the dependency in metacode module 
> to solve the problem.
> 
> Added:
>     incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/
>     
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/
>     
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> l/jaxb/misc_test.xsd
> Removed:
>     incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb/
> Modified:
>     incubator/cxf/trunk/distribution/pom.xml
>     incubator/cxf/trunk/integration/jca/pom.xml
>     incubator/cxf/trunk/metacode/pom.xml
>     incubator/cxf/trunk/pom.xml
>     incubator/cxf/trunk/rt/bindings/xml/pom.xml
>     incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
>     incubator/cxf/trunk/rt/management/pom.xml
>     incubator/cxf/trunk/rt/pom.xml
>     incubator/cxf/trunk/rt/ws/policy/pom.xml
>     incubator/cxf/trunk/testutils/pom.xml
>     incubator/cxf/trunk/tools2/common/pom.xml
>     incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
>     incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
>     incubator/cxf/trunk/tools2/pom.xml
>     incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
>     incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
>     incubator/cxf/trunk/tools2/xjc/dv/pom.xml
>     incubator/cxf/trunk/tools2/xjc/pom.xml
> 
> Modified: incubator/cxf/trunk/distribution/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/
> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/distribution/pom.xml (original)
> +++ incubator/cxf/trunk/distribution/pom.xml Wed Mar 14 02:31:10 2007
> @@ -55,32 +55,27 @@
>          </dependency>
>          <dependency>
>              <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-common</artifactId>
> +            <artifactId>cxf-tools2-common</artifactId>
>              <version>${pom.version}</version>
>          </dependency>
>          <dependency>
>              <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-validator</artifactId>
> +            <artifactId>cxf-tools2-validator</artifactId>
>              <version>${pom.version}</version>
>          </dependency>
>          <dependency>
>              <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-wsdl2java</artifactId>
> +            <artifactId>cxf-tools2-wsdl2java</artifactId>
>              <version>${pom.version}</version>
>          </dependency>
>          <dependency>
>              <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-java2wsdl</artifactId>
> +            <artifactId>cxf-tools2-java2wsdl</artifactId>
>              <version>${pom.version}</version>
>          </dependency>
>          <dependency>
>              <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-misctools</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -        <dependency>
> -            <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-xjc-dv</artifactId>
> +            <artifactId>cxf-tools2-xjc-dv</artifactId>
>              <version>${pom.version}</version>
>          </dependency>
>  
> 
> Modified: incubator/cxf/trunk/integration/jca/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/j
> ca/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/integration/jca/pom.xml (original)
> +++ incubator/cxf/trunk/integration/jca/pom.xml Wed Mar 14 
> 02:31:10 2007
> @@ -82,7 +82,7 @@
>  
>          <dependency>
>              <groupId>org.apache.cxf</groupId>
> -            <artifactId>cxf-tools-common</artifactId>
> +            <artifactId>cxf-tools2-common</artifactId>
>              <version>${project.version}</version>
>          </dependency>
>  
> 
> Modified: incubator/cxf/trunk/metacode/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/pom.
> xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/metacode/pom.xml (original)
> +++ incubator/cxf/trunk/metacode/pom.xml Wed Mar 14 02:31:10 2007
> @@ -142,7 +142,13 @@
>                          </goals>
>                      </execution>
>                  </executions>
> +
>                  <dependencies>
> +                    <dependency>
> +                        <groupId>org.apache.cxf</groupId>
> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
> +                        <version>${project.version}</version>
> +                    </dependency>
>                      <dependency>
>                          <groupId>org.apache.cxf</groupId>
>                          <artifactId>cxf-common-utilities</artifactId>
> 
> Modified: incubator/cxf/trunk/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=
> diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/pom.xml (original)
> +++ incubator/cxf/trunk/pom.xml Wed Mar 14 02:31:10 2007
> @@ -125,13 +125,11 @@
>          <module>parent</module>
>          <module>common</module>
>          <module>api</module>
> -        <module>rt/core</module>       
>          <module>metacode</module>
>          <module>tools2</module>
>          <module>codegen-plugin2</module>       
>          <module>testutils</module>
>          <module>rt</module>
> -        <module>tools2/javato</module>
>          <module>integration</module>
>          <module>systests</module>
>      </modules>
> 
> Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/x
> ml/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
> +++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Wed Mar 14 
> 02:31:10 2007
> @@ -73,9 +73,9 @@
>          </dependency>
>          
>           <dependency>
> -	            <groupId>org.apache.cxf</groupId>
> -	            <artifactId>cxf-tools2-common</artifactId>
> -	            <version>${project.version}</version>
> +	     <groupId>org.apache.cxf</groupId>
> +	     <artifactId>cxf-tools2-common</artifactId>
> +	     <version>${project.version}</version>
>          </dependency>
>         
>          
> 
> Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
> g/jaxb/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
> +++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Wed Mar 
> 14 02:31:10 
> +++ 2007
> @@ -55,6 +55,28 @@
>                      </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>
> +                            
> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> +                            <xsdOptions>
> +                                <xsdOption>
> +                                    
> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> +                                </xsdOption>
> +                            </xsdOptions>
> +                        </configuration>
> +                        <goals>
> +                            <goal>xsdtojava</goal>
> +                        </goals>
> +                    </execution>
> +                </executions>
> +            </plugin>
>          </plugins>
>      </build>
>  
> 
> Added: 
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> l/jaxb/misc_test.xsd
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
> g/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd?view=auto&rev=518082
> ==============================================================
> ================
> --- 
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> l/jaxb/misc_test.xsd (added)
> +++ 
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb
> +++ /misc_test.xsd Wed Mar 14 02:31:10 2007
> @@ -0,0 +1,10 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<schema xmlns="http://www.w3.org/2001/XMLSchema" 
> targetNamespace="http://cxf.apache.org/jaxb_misc"
> +    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
> xmlns:tns="http://cxf.apache.org/jaxb_misc">
> +    <xs:complexType name="Base64WithDefaultValueType">
> +        <xs:sequence>
> +            <xs:element name="EndPart" type="xs:string" />
> +        </xs:sequence>
> +        <xs:attribute name="AttributeWithDefaultValue" 
> type="xs:base64Binary" default="1223" />
> +    </xs:complexType>
> +</schema>
> \ No newline at end of file
> 
> Modified: incubator/cxf/trunk/rt/management/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management
> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/rt/management/pom.xml (original)
> +++ incubator/cxf/trunk/rt/management/pom.xml Wed Mar 14 02:31:10 2007
> @@ -67,12 +67,6 @@
>          </dependency>
>          
>          <dependency>
> -	    <groupId>org.apache.cxf</groupId>
> -	    <artifactId>cxf-tools2-xjc-dv</artifactId>
> -	    <version>${project.version}</version>
> -        </dependency>
> -
> -        <dependency>
>              <groupId>org.easymock</groupId>
>              <artifactId>easymockclassextension</artifactId>
>              <scope>test</scope>
> 
> Modified: incubator/cxf/trunk/rt/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?vi
> ew=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/rt/pom.xml (original)
> +++ incubator/cxf/trunk/rt/pom.xml Wed Mar 14 02:31:10 2007
> @@ -32,7 +32,7 @@
>      </parent>
>  
>      <modules>
> -        <module>management</module>
> +        <module>core</module>
>          <module>transports/local</module>
>          <module>databinding/jaxb</module>
>          <module>databinding/aegis</module>
> @@ -46,6 +46,7 @@
>          <module>ws/policy</module>
>          <module>ws/addr</module>
>          <module>ws/rm</module>
> +        <module>management</module>
>      </modules>
>  
>      <scm>
> 
> Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/
> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
> +++ incubator/cxf/trunk/rt/ws/policy/pom.xml Wed Mar 14 02:31:10 2007
> @@ -116,7 +116,7 @@
>              </plugin>
>              <plugin>
>                  <groupId>org.apache.cxf</groupId>
> -                <artifactId>cxf-codegen-plugin</artifactId>
> +                <artifactId>cxf-codegen-plugin2</artifactId>
>                  <version>${project.version}</version>
>                  <executions>
>                      <execution>
> 
> Modified: incubator/cxf/trunk/testutils/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom
> .xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/testutils/pom.xml (original)
> +++ incubator/cxf/trunk/testutils/pom.xml Wed Mar 14 02:31:10 2007
> @@ -143,41 +143,6 @@
>              </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>
> -                            
> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> -                            <xsdOptions>
> -                                <xsdOption>
> -                                    
> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> -                                </xsdOption>
> -                            </xsdOptions>
> -                        </configuration>
> -                        <goals>
> -                            <goal>xsdtojava</goal>
> -                        </goals>
> -                    </execution>
> -                </executions>
> -                <dependencies>
> -		                    <dependency>
> -		                        
> <groupId>org.apache.cxf</groupId>
> -		                        
> <artifactId>cxf-tools2-xjc-dv</artifactId>
> -		                        
> <version>${project.version}</version>
> -		                    </dependency>
> -		                    <dependency>
> -		                        
> <groupId>org.apache.cxf</groupId>
> -		                        
> <artifactId>cxf-common-utilities</artifactId>
> -		                        
> <version>${project.version}</version>
> -		                    </dependency>
> -                </dependencies>
> -                
> -            </plugin>
> -            <plugin>
> -                <groupId>org.apache.cxf</groupId>
>                  <artifactId>cxf-codegen-plugin2</artifactId>
>                  <version>${project.version}</version>
>                  <executions>
> @@ -186,11 +151,6 @@
>                          <phase>generate-sources</phase>
>                          <configuration>
>                              
> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> -                            <xsdOptions>
> -                                <xsdOption>
> -                                    
> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> -                                </xsdOption>
> -                            </xsdOptions>
>                              <wsdlOptions>
>                                  <wsdlOption>
>                                      
> <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
> 
> Modified: incubator/cxf/trunk/tools2/common/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common
> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/common/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/common/pom.xml Wed Mar 14 02:31:10 2007
> @@ -1,20 +1,20 @@
>  <!--
> -  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
> -  to you under the Apache License, Version 2.0 (the
> -  "License"); you may not use this file except in compliance
> -  with the License. You may obtain a copy of the License at
> -
> -  http://www.apache.org/licenses/LICENSE-2.0
> -
> -  Unless required by applicable law or agreed to in writing,
> -  software distributed under the License is distributed on an
> -  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> -  KIND, either express or implied. See the License for the
> -  specific language governing permissions and limitations
> -  under the License.
> +    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
> +    to you under the Apache License, Version 2.0 (the
> +    "License"); you may not use this file except in compliance
> +    with the License. You may obtain a copy of the License at
> +    
> +    http://www.apache.org/licenses/LICENSE-2.0
> +    
> +    Unless required by applicable law or agreed to in writing,
> +    software distributed under the License is distributed on an
> +    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +    KIND, either express or implied. See the License for the
> +    specific language governing permissions and limitations
> +    under the License.
>  -->
>  <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>
> @@ -26,120 +26,120 @@
>      <url>http://cwiki.apache.org/CXF</url>
>  
>      <parent>
> -        <groupId>org.apache.cxf</groupId>
> -        <artifactId>cxf-parent</artifactId>
> -        <version>2.0-incubator-RC-SNAPSHOT</version>
> -        <relativePath>../../parent/pom.xml</relativePath>
> +	<groupId>org.apache.cxf</groupId>
> +	<artifactId>cxf-parent</artifactId>
> +	<version>2.0-incubator-RC-SNAPSHOT</version>
> +	<relativePath>../../parent/pom.xml</relativePath>
>      </parent>
>  
> -     <dependencies>
> -            <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>velocity</groupId>
> -                <artifactId>velocity</artifactId>
> -            </dependency>
> -    
> -            <dependency>
> -                <groupId>wsdl4j</groupId>
> -                <artifactId>wsdl4j</artifactId>
> -            </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.soap</groupId>
> -                <artifactId>saaj-api</artifactId>
> -            </dependency>
> -    
> -            <dependency>
> -                <groupId>org.apache.geronimo.specs</groupId>
> -                <artifactId>geronimo-activation_1.1_spec</artifactId>
> -            </dependency>
> +    <dependencies>
> +	<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>velocity</groupId>
> +	    <artifactId>velocity</artifactId>
> +	</dependency>
> +	
> +	<dependency>
> +	    <groupId>wsdl4j</groupId>
> +	    <artifactId>wsdl4j</artifactId>
> +	</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.soap</groupId>
> +	    <artifactId>saaj-api</artifactId>
> +	</dependency>
> +	
> +	<dependency>
> +	    <groupId>org.apache.geronimo.specs</groupId>
> +	    <artifactId>geronimo-activation_1.1_spec</artifactId>
> +	</dependency>
>  
> -            <dependency>
> -                <groupId>org.apache.cxf</groupId>
> -                <artifactId>cxf-common-utilities</artifactId>
> -                <version>${project.version}</version>
> -            </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-api</artifactId>
> -	    	<version>${project.version}</version>
> -            </dependency>
> -            
> -        </dependencies>
> +	<dependency>
> +	    <groupId>org.apache.cxf</groupId>
> +	    <artifactId>cxf-common-utilities</artifactId>
> +	    <version>${project.version}</version>
> +	</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-api</artifactId>
> +	    <version>${project.version}</version>
> +	</dependency>
> +	
> +    </dependencies>
>  
>  
>      <scm>
> -        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools2/common</connection>
> -        
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> incubator/cxf/trunk/tools2/common</developerConnection>
> +	
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools2/common</connection>
> +	
> +<developerConnection>scm:svn:https://svn.apache.org/repos/asf
> /incubator
> +/cxf/trunk/tools2/common</developerConnection>
>      </scm>
>      
>      <build>
> -            <plugins>
> -                <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>
> -                                
> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> -                                <xsdOptions>
> -                                    <xsdOption>
> -                                        
> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
> -                                        
> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
> nding.xjb</bindingFile>
> -                                        <deleteDirs>
> -                                            
> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> e/cxf/wsdl</deleteDir>
> -                                        </deleteDirs>
> -                                    </xsdOption>
> -                                    
> -                                <xsdOption>
> -                                    
> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
> -                                    
> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
> b</bindingFile>
> -                                    <deleteDirs>
> -                                        
> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> e/cxf/wsdl</deleteDir>
> -                                    </deleteDirs>
> -                                </xsdOption>
> -                                    
> -                                </xsdOptions>
> -                            </configuration>
> -                            <goals>
> -                                <goal>xsdtojava</goal>
> -                            </goals>
> -                        </execution>
> -                    </executions>
> -                </plugin>
> -            </plugins>
> -     </build>    
> +	<plugins>
> +	    <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>
> +			    
> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> +			    <xsdOptions>
> +				<xsdOption>
> +				    
> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
> +				    
> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
> nding.xjb</bindingFile>
> +				    <deleteDirs>
> +					
> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> e/cxf/wsdl</deleteDir>
> +				    </deleteDirs>
> +				</xsdOption>
> +				
> +				<xsdOption>
> +				    
> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
> +				    
> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
> b</bindingFile>
> +				    <deleteDirs>
> +					
> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> e/cxf/wsdl</deleteDir>
> +				    </deleteDirs>
> +				</xsdOption>
> +				
> +			    </xsdOptions>
> +			</configuration>
> +			<goals>
> +			    <goal>xsdtojava</goal>
> +			</goals>
> +		    </execution>
> +		</executions>
> +	    </plugin>
> +	</plugins>
> +    </build>    
>  
>  </project>
> 
> Modified: incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
> e-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml Wed Mar 14 
> +++ 02:31:10 2007
> @@ -155,7 +155,7 @@
>              </plugin>
>              <plugin>
>                  <groupId>org.apache.cxf</groupId>
> -                <artifactId>cxf-codegen-plugin</artifactId>
> +                <artifactId>cxf-codegen-plugin2</artifactId>
>                  <version>${project.version}</version>
>                  <executions>
>                      <execution>
> 
> Modified: incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
> e3.1-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml Wed Mar 14 
> +++ 02:31:10 2007
> @@ -155,7 +155,7 @@
>              </plugin>
>              <plugin>
>                  <groupId>org.apache.cxf</groupId>
> -                <artifactId>cxf-codegen-plugin</artifactId>
> +                <artifactId>cxf-codegen-plugin2</artifactId>
>                  <version>${project.version}</version>
>                  <executions>
>                      <execution>
> 
> Modified: incubator/cxf/trunk/tools2/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/pom.xm
> l?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/pom.xml Wed Mar 14 02:31:10 2007
> @@ -36,6 +36,7 @@
>          <module>validator</module>
>          <module>wsdlto</module>
>          <module>xjc</module>
> +        <module>javato</module>
>      </modules>
>  
>      <scm>
> 
> Modified: incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto
> /misc/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml Wed Mar 14 
> 02:31:10 
> +++ 2007
> @@ -22,7 +22,7 @@
>      <artifactId>cxf-tools2-misctools</artifactId>
>      <packaging>jar</packaging>
>      <version>2.0-incubator-RC-SNAPSHOT</version>
> -    <name>Apache CXF Command Line Misctools</name>
> +    <name>Apache CXF Command Line Tools2 WSDLTo Misctools</name>
>      <url>http://cwiki.apache.org/CXF</url>
>  
>      <parent>
> 
> Modified: incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
> -test/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml Wed Mar 14 
> 02:31:10 
> +++ 2007
> @@ -96,7 +96,7 @@
>                  <dependencies>
>                      <dependency>
>                          <groupId>org.apache.cxf</groupId>
> -                        <artifactId>cxf-tools-xjc-dv</artifactId>
> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
>                          <version>${project.version}</version>
>                      </dependency>
>                  </dependencies>
> @@ -106,8 +106,8 @@
>  
>  
>      <scm>
> -        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools/xjc/dv-test</connection>
> -        
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> incubator/cxf/trunk/tools/xjc/dv-test</developerConnection>
> +        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools2/xjc/dv-test</connection>
> +        
> + 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
> + r/cxf/trunk/tools2/xjc/dv-test</developerConnection>
>      </scm>
>  
>  </project>
> 
> Modified: incubator/cxf/trunk/tools2/xjc/dv/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/xjc/dv/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/xjc/dv/pom.xml Wed Mar 14 02:31:10 2007
> @@ -54,8 +54,8 @@
>  
>  
>      <scm>
> -        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools/xjc/dv</connection>
> -        
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> incubator/cxf/trunk/tools/xjc/dv</developerConnection>
> +        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools2/xjc/dv</connection>
> +        
> + 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
> + r/cxf/trunk/tools2/xjc/dv</developerConnection>
>      </scm>
>  
>  </project>
> 
> Modified: incubator/cxf/trunk/tools2/xjc/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/po
> m.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/xjc/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/xjc/pom.xml Wed Mar 14 02:31:10 2007
> @@ -38,8 +38,8 @@
>      </modules>
>  
>      <scm>
> -        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools/xjc</connection>
> -        
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> incubator/cxf/trunk/tools/xjc</developerConnection>
> +        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools2/xjc</connection>
> +        
> + 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
> + r/cxf/trunk/tools2/xjc</developerConnection>
>      </scm>
>  
>  </project>
> 
> 
> 

RE: svn commit: r518082 - in /incubator/cxf/trunk: ./ distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/ rt/databinding/jaxb/ rt/databinding/jaxb/src/main/resources/wsdl/ rt/databinding/jaxb/src/main/resources/wsdl/jaxb/ rt/management/ rt/ws/po

Posted by "Glynn, Eoghan" <eo...@iona.com>.

James,

Since your update of the pom to pick up the cxf-tools2-* as opposed to
cxf-tools-* I'm seeing a build failure as below.

Have the tool2 artifacts actually been pushed up to the maven repo?

/Eoghan



[ERROR] BUILD ERROR
[INFO]
------------------------------------------------------------------------
[INFO] Failed to resolve artifact.

Missing:
----------
1) org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT

  Try downloading the file manually from the project website.

  Then, install it using the command:
      mvn install:install-file -DgroupId=org.apache.cxf
-DartifactId=cxf-tools2-xjc-dv \
          -Dversion=2.0-incubator-RC-SNAPSHOT -Dpackaging=jar
-Dfile=/path/to/file

  Path to dependency:
        1)
org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT
        2)
org.apache.cxf:cxf-tools2-xjc-dv:jar:2.0-incubator-RC-SNAPSHOT

----------
1 required artifact is missing.

for artifact:
  org.apache.cxf:cxf-common-xsd:maven-plugin:2.0-incubator-RC-SNAPSHOT

from the specified remote repositories:
  central (http://repo1.maven.org/maven2)

 

> -----Original Message-----
> From: mmao@apache.org [mailto:mmao@apache.org] 
> Sent: 14 March 2007 09:31
> To: cxf-commits@incubator.apache.org
> Subject: svn commit: r518082 - in /incubator/cxf/trunk: ./ 
> distribution/ integration/jca/ metacode/ rt/ rt/bindings/xml/ 
> rt/databinding/jaxb/ 
> rt/databinding/jaxb/src/main/resources/wsdl/ 
> rt/databinding/jaxb/src/main/resources/wsdl/jaxb/ 
> rt/management/ rt/ws/pol...
> 
> Author: mmao
> Date: Wed Mar 14 02:31:10 2007
> New Revision: 518082
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=518082
> Log:
> Fix build and pom updates
> 
> * update all the pom to use tools2
> * move misc_test.xsd to rt/databinding/jaxb, since it's only 
> used in this module
> * there is a bug in common/xsd plugin when loading jaxb 
> plugins, we temporarily add the dependency in metacode module 
> to solve the problem.
> 
> Added:
>     incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/
>     
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb/
>     
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> l/jaxb/misc_test.xsd
> Removed:
>     incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb/
> Modified:
>     incubator/cxf/trunk/distribution/pom.xml
>     incubator/cxf/trunk/integration/jca/pom.xml
>     incubator/cxf/trunk/metacode/pom.xml
>     incubator/cxf/trunk/pom.xml
>     incubator/cxf/trunk/rt/bindings/xml/pom.xml
>     incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
>     incubator/cxf/trunk/rt/management/pom.xml
>     incubator/cxf/trunk/rt/pom.xml
>     incubator/cxf/trunk/rt/ws/policy/pom.xml
>     incubator/cxf/trunk/testutils/pom.xml
>     incubator/cxf/trunk/tools2/common/pom.xml
>     incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
>     incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
>     incubator/cxf/trunk/tools2/pom.xml
>     incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
>     incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
>     incubator/cxf/trunk/tools2/xjc/dv/pom.xml
>     incubator/cxf/trunk/tools2/xjc/pom.xml
> 
> Modified: incubator/cxf/trunk/distribution/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/
> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/distribution/pom.xml (original)
> +++ incubator/cxf/trunk/distribution/pom.xml Wed Mar 14 02:31:10 2007
> @@ -55,32 +55,27 @@
>          </dependency>
>          <dependency>
>              <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-common</artifactId>
> +            <artifactId>cxf-tools2-common</artifactId>
>              <version>${pom.version}</version>
>          </dependency>
>          <dependency>
>              <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-validator</artifactId>
> +            <artifactId>cxf-tools2-validator</artifactId>
>              <version>${pom.version}</version>
>          </dependency>
>          <dependency>
>              <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-wsdl2java</artifactId>
> +            <artifactId>cxf-tools2-wsdl2java</artifactId>
>              <version>${pom.version}</version>
>          </dependency>
>          <dependency>
>              <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-java2wsdl</artifactId>
> +            <artifactId>cxf-tools2-java2wsdl</artifactId>
>              <version>${pom.version}</version>
>          </dependency>
>          <dependency>
>              <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-misctools</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -        <dependency>
> -            <groupId>${pom.groupId}</groupId>
> -            <artifactId>cxf-tools-xjc-dv</artifactId>
> +            <artifactId>cxf-tools2-xjc-dv</artifactId>
>              <version>${pom.version}</version>
>          </dependency>
>  
> 
> Modified: incubator/cxf/trunk/integration/jca/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/j
> ca/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/integration/jca/pom.xml (original)
> +++ incubator/cxf/trunk/integration/jca/pom.xml Wed Mar 14 
> 02:31:10 2007
> @@ -82,7 +82,7 @@
>  
>          <dependency>
>              <groupId>org.apache.cxf</groupId>
> -            <artifactId>cxf-tools-common</artifactId>
> +            <artifactId>cxf-tools2-common</artifactId>
>              <version>${project.version}</version>
>          </dependency>
>  
> 
> Modified: incubator/cxf/trunk/metacode/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/pom.
> xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/metacode/pom.xml (original)
> +++ incubator/cxf/trunk/metacode/pom.xml Wed Mar 14 02:31:10 2007
> @@ -142,7 +142,13 @@
>                          </goals>
>                      </execution>
>                  </executions>
> +
>                  <dependencies>
> +                    <dependency>
> +                        <groupId>org.apache.cxf</groupId>
> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
> +                        <version>${project.version}</version>
> +                    </dependency>
>                      <dependency>
>                          <groupId>org.apache.cxf</groupId>
>                          <artifactId>cxf-common-utilities</artifactId>
> 
> Modified: incubator/cxf/trunk/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=
> diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/pom.xml (original)
> +++ incubator/cxf/trunk/pom.xml Wed Mar 14 02:31:10 2007
> @@ -125,13 +125,11 @@
>          <module>parent</module>
>          <module>common</module>
>          <module>api</module>
> -        <module>rt/core</module>       
>          <module>metacode</module>
>          <module>tools2</module>
>          <module>codegen-plugin2</module>       
>          <module>testutils</module>
>          <module>rt</module>
> -        <module>tools2/javato</module>
>          <module>integration</module>
>          <module>systests</module>
>      </modules>
> 
> Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/x
> ml/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
> +++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Wed Mar 14 
> 02:31:10 2007
> @@ -73,9 +73,9 @@
>          </dependency>
>          
>           <dependency>
> -	            <groupId>org.apache.cxf</groupId>
> -	            <artifactId>cxf-tools2-common</artifactId>
> -	            <version>${project.version}</version>
> +	     <groupId>org.apache.cxf</groupId>
> +	     <artifactId>cxf-tools2-common</artifactId>
> +	     <version>${project.version}</version>
>          </dependency>
>         
>          
> 
> Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
> g/jaxb/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
> +++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Wed Mar 
> 14 02:31:10 
> +++ 2007
> @@ -55,6 +55,28 @@
>                      </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>
> +                            
> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> +                            <xsdOptions>
> +                                <xsdOption>
> +                                    
> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> +                                </xsdOption>
> +                            </xsdOptions>
> +                        </configuration>
> +                        <goals>
> +                            <goal>xsdtojava</goal>
> +                        </goals>
> +                    </execution>
> +                </executions>
> +            </plugin>
>          </plugins>
>      </build>
>  
> 
> Added: 
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> l/jaxb/misc_test.xsd
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databindin
> g/jaxb/src/main/resources/wsdl/jaxb/misc_test.xsd?view=auto&rev=518082
> ==============================================================
> ================
> --- 
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsd
> l/jaxb/misc_test.xsd (added)
> +++ 
> incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/wsdl/jaxb
> +++ /misc_test.xsd Wed Mar 14 02:31:10 2007
> @@ -0,0 +1,10 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<schema xmlns="http://www.w3.org/2001/XMLSchema" 
> targetNamespace="http://cxf.apache.org/jaxb_misc"
> +    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
> xmlns:tns="http://cxf.apache.org/jaxb_misc">
> +    <xs:complexType name="Base64WithDefaultValueType">
> +        <xs:sequence>
> +            <xs:element name="EndPart" type="xs:string" />
> +        </xs:sequence>
> +        <xs:attribute name="AttributeWithDefaultValue" 
> type="xs:base64Binary" default="1223" />
> +    </xs:complexType>
> +</schema>
> \ No newline at end of file
> 
> Modified: incubator/cxf/trunk/rt/management/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management
> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/rt/management/pom.xml (original)
> +++ incubator/cxf/trunk/rt/management/pom.xml Wed Mar 14 02:31:10 2007
> @@ -67,12 +67,6 @@
>          </dependency>
>          
>          <dependency>
> -	    <groupId>org.apache.cxf</groupId>
> -	    <artifactId>cxf-tools2-xjc-dv</artifactId>
> -	    <version>${project.version}</version>
> -        </dependency>
> -
> -        <dependency>
>              <groupId>org.easymock</groupId>
>              <artifactId>easymockclassextension</artifactId>
>              <scope>test</scope>
> 
> Modified: incubator/cxf/trunk/rt/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?vi
> ew=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/rt/pom.xml (original)
> +++ incubator/cxf/trunk/rt/pom.xml Wed Mar 14 02:31:10 2007
> @@ -32,7 +32,7 @@
>      </parent>
>  
>      <modules>
> -        <module>management</module>
> +        <module>core</module>
>          <module>transports/local</module>
>          <module>databinding/jaxb</module>
>          <module>databinding/aegis</module>
> @@ -46,6 +46,7 @@
>          <module>ws/policy</module>
>          <module>ws/addr</module>
>          <module>ws/rm</module>
> +        <module>management</module>
>      </modules>
>  
>      <scm>
> 
> Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/
> pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
> +++ incubator/cxf/trunk/rt/ws/policy/pom.xml Wed Mar 14 02:31:10 2007
> @@ -116,7 +116,7 @@
>              </plugin>
>              <plugin>
>                  <groupId>org.apache.cxf</groupId>
> -                <artifactId>cxf-codegen-plugin</artifactId>
> +                <artifactId>cxf-codegen-plugin2</artifactId>
>                  <version>${project.version}</version>
>                  <executions>
>                      <execution>
> 
> Modified: incubator/cxf/trunk/testutils/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom
> .xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/testutils/pom.xml (original)
> +++ incubator/cxf/trunk/testutils/pom.xml Wed Mar 14 02:31:10 2007
> @@ -143,41 +143,6 @@
>              </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>
> -                            
> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> -                            <xsdOptions>
> -                                <xsdOption>
> -                                    
> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> -                                </xsdOption>
> -                            </xsdOptions>
> -                        </configuration>
> -                        <goals>
> -                            <goal>xsdtojava</goal>
> -                        </goals>
> -                    </execution>
> -                </executions>
> -                <dependencies>
> -		                    <dependency>
> -		                        
> <groupId>org.apache.cxf</groupId>
> -		                        
> <artifactId>cxf-tools2-xjc-dv</artifactId>
> -		                        
> <version>${project.version}</version>
> -		                    </dependency>
> -		                    <dependency>
> -		                        
> <groupId>org.apache.cxf</groupId>
> -		                        
> <artifactId>cxf-common-utilities</artifactId>
> -		                        
> <version>${project.version}</version>
> -		                    </dependency>
> -                </dependencies>
> -                
> -            </plugin>
> -            <plugin>
> -                <groupId>org.apache.cxf</groupId>
>                  <artifactId>cxf-codegen-plugin2</artifactId>
>                  <version>${project.version}</version>
>                  <executions>
> @@ -186,11 +151,6 @@
>                          <phase>generate-sources</phase>
>                          <configuration>
>                              
> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> -                            <xsdOptions>
> -                                <xsdOption>
> -                                    
> <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
> -                                </xsdOption>
> -                            </xsdOptions>
>                              <wsdlOptions>
>                                  <wsdlOption>
>                                      
> <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
> 
> Modified: incubator/cxf/trunk/tools2/common/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common
> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/common/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/common/pom.xml Wed Mar 14 02:31:10 2007
> @@ -1,20 +1,20 @@
>  <!--
> -  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
> -  to you under the Apache License, Version 2.0 (the
> -  "License"); you may not use this file except in compliance
> -  with the License. You may obtain a copy of the License at
> -
> -  http://www.apache.org/licenses/LICENSE-2.0
> -
> -  Unless required by applicable law or agreed to in writing,
> -  software distributed under the License is distributed on an
> -  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> -  KIND, either express or implied. See the License for the
> -  specific language governing permissions and limitations
> -  under the License.
> +    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
> +    to you under the Apache License, Version 2.0 (the
> +    "License"); you may not use this file except in compliance
> +    with the License. You may obtain a copy of the License at
> +    
> +    http://www.apache.org/licenses/LICENSE-2.0
> +    
> +    Unless required by applicable law or agreed to in writing,
> +    software distributed under the License is distributed on an
> +    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +    KIND, either express or implied. See the License for the
> +    specific language governing permissions and limitations
> +    under the License.
>  -->
>  <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>
> @@ -26,120 +26,120 @@
>      <url>http://cwiki.apache.org/CXF</url>
>  
>      <parent>
> -        <groupId>org.apache.cxf</groupId>
> -        <artifactId>cxf-parent</artifactId>
> -        <version>2.0-incubator-RC-SNAPSHOT</version>
> -        <relativePath>../../parent/pom.xml</relativePath>
> +	<groupId>org.apache.cxf</groupId>
> +	<artifactId>cxf-parent</artifactId>
> +	<version>2.0-incubator-RC-SNAPSHOT</version>
> +	<relativePath>../../parent/pom.xml</relativePath>
>      </parent>
>  
> -     <dependencies>
> -            <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>velocity</groupId>
> -                <artifactId>velocity</artifactId>
> -            </dependency>
> -    
> -            <dependency>
> -                <groupId>wsdl4j</groupId>
> -                <artifactId>wsdl4j</artifactId>
> -            </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.soap</groupId>
> -                <artifactId>saaj-api</artifactId>
> -            </dependency>
> -    
> -            <dependency>
> -                <groupId>org.apache.geronimo.specs</groupId>
> -                <artifactId>geronimo-activation_1.1_spec</artifactId>
> -            </dependency>
> +    <dependencies>
> +	<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>velocity</groupId>
> +	    <artifactId>velocity</artifactId>
> +	</dependency>
> +	
> +	<dependency>
> +	    <groupId>wsdl4j</groupId>
> +	    <artifactId>wsdl4j</artifactId>
> +	</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.soap</groupId>
> +	    <artifactId>saaj-api</artifactId>
> +	</dependency>
> +	
> +	<dependency>
> +	    <groupId>org.apache.geronimo.specs</groupId>
> +	    <artifactId>geronimo-activation_1.1_spec</artifactId>
> +	</dependency>
>  
> -            <dependency>
> -                <groupId>org.apache.cxf</groupId>
> -                <artifactId>cxf-common-utilities</artifactId>
> -                <version>${project.version}</version>
> -            </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-api</artifactId>
> -	    	<version>${project.version}</version>
> -            </dependency>
> -            
> -        </dependencies>
> +	<dependency>
> +	    <groupId>org.apache.cxf</groupId>
> +	    <artifactId>cxf-common-utilities</artifactId>
> +	    <version>${project.version}</version>
> +	</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-api</artifactId>
> +	    <version>${project.version}</version>
> +	</dependency>
> +	
> +    </dependencies>
>  
>  
>      <scm>
> -        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools2/common</connection>
> -        
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> incubator/cxf/trunk/tools2/common</developerConnection>
> +	
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools2/common</connection>
> +	
> +<developerConnection>scm:svn:https://svn.apache.org/repos/asf
> /incubator
> +/cxf/trunk/tools2/common</developerConnection>
>      </scm>
>      
>      <build>
> -            <plugins>
> -                <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>
> -                                
> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> -                                <xsdOptions>
> -                                    <xsdOption>
> -                                        
> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
> -                                        
> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
> nding.xjb</bindingFile>
> -                                        <deleteDirs>
> -                                            
> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> e/cxf/wsdl</deleteDir>
> -                                        </deleteDirs>
> -                                    </xsdOption>
> -                                    
> -                                <xsdOption>
> -                                    
> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
> -                                    
> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
> b</bindingFile>
> -                                    <deleteDirs>
> -                                        
> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> e/cxf/wsdl</deleteDir>
> -                                    </deleteDirs>
> -                                </xsdOption>
> -                                    
> -                                </xsdOptions>
> -                            </configuration>
> -                            <goals>
> -                                <goal>xsdtojava</goal>
> -                            </goals>
> -                        </execution>
> -                    </executions>
> -                </plugin>
> -            </plugins>
> -     </build>    
> +	<plugins>
> +	    <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>
> +			    
> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
> +			    <xsdOptions>
> +				<xsdOption>
> +				    
> <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
> +				    
> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-bi
> nding.xjb</bindingFile>
> +				    <deleteDirs>
> +					
> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> e/cxf/wsdl</deleteDir>
> +				    </deleteDirs>
> +				</xsdOption>
> +				
> +				<xsdOption>
> +				    
> <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
> +				    
> <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xj
> b</bindingFile>
> +				    <deleteDirs>
> +					
> <deleteDir>${basedir}/target/generated/src/main/java/org/apach
> e/cxf/wsdl</deleteDir>
> +				    </deleteDirs>
> +				</xsdOption>
> +				
> +			    </xsdOptions>
> +			</configuration>
> +			<goals>
> +			    <goal>xsdtojava</goal>
> +			</goals>
> +		    </execution>
> +		</executions>
> +	    </plugin>
> +	</plugins>
> +    </build>    
>  
>  </project>
> 
> Modified: incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
> e-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/eclipse-plugin/pom.xml Wed Mar 14 
> +++ 02:31:10 2007
> @@ -155,7 +155,7 @@
>              </plugin>
>              <plugin>
>                  <groupId>org.apache.cxf</groupId>
> -                <artifactId>cxf-codegen-plugin</artifactId>
> +                <artifactId>cxf-codegen-plugin2</artifactId>
>                  <version>${project.version}</version>
>                  <executions>
>                      <execution>
> 
> Modified: incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/eclips
> e3.1-plugin/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/eclipse3.1-plugin/pom.xml Wed Mar 14 
> +++ 02:31:10 2007
> @@ -155,7 +155,7 @@
>              </plugin>
>              <plugin>
>                  <groupId>org.apache.cxf</groupId>
> -                <artifactId>cxf-codegen-plugin</artifactId>
> +                <artifactId>cxf-codegen-plugin2</artifactId>
>                  <version>${project.version}</version>
>                  <executions>
>                      <execution>
> 
> Modified: incubator/cxf/trunk/tools2/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/pom.xm
> l?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/pom.xml Wed Mar 14 02:31:10 2007
> @@ -36,6 +36,7 @@
>          <module>validator</module>
>          <module>wsdlto</module>
>          <module>xjc</module>
> +        <module>javato</module>
>      </modules>
>  
>      <scm>
> 
> Modified: incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto
> /misc/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml Wed Mar 14 
> 02:31:10 
> +++ 2007
> @@ -22,7 +22,7 @@
>      <artifactId>cxf-tools2-misctools</artifactId>
>      <packaging>jar</packaging>
>      <version>2.0-incubator-RC-SNAPSHOT</version>
> -    <name>Apache CXF Command Line Misctools</name>
> +    <name>Apache CXF Command Line Tools2 WSDLTo Misctools</name>
>      <url>http://cwiki.apache.org/CXF</url>
>  
>      <parent>
> 
> Modified: incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
> -test/pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml Wed Mar 14 
> 02:31:10 
> +++ 2007
> @@ -96,7 +96,7 @@
>                  <dependencies>
>                      <dependency>
>                          <groupId>org.apache.cxf</groupId>
> -                        <artifactId>cxf-tools-xjc-dv</artifactId>
> +                        <artifactId>cxf-tools2-xjc-dv</artifactId>
>                          <version>${project.version}</version>
>                      </dependency>
>                  </dependencies>
> @@ -106,8 +106,8 @@
>  
>  
>      <scm>
> -        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools/xjc/dv-test</connection>
> -        
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> incubator/cxf/trunk/tools/xjc/dv-test</developerConnection>
> +        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools2/xjc/dv-test</connection>
> +        
> + 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
> + r/cxf/trunk/tools2/xjc/dv-test</developerConnection>
>      </scm>
>  
>  </project>
> 
> Modified: incubator/cxf/trunk/tools2/xjc/dv/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv
> /pom.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/xjc/dv/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/xjc/dv/pom.xml Wed Mar 14 02:31:10 2007
> @@ -54,8 +54,8 @@
>  
>  
>      <scm>
> -        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools/xjc/dv</connection>
> -        
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> incubator/cxf/trunk/tools/xjc/dv</developerConnection>
> +        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools2/xjc/dv</connection>
> +        
> + 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
> + r/cxf/trunk/tools2/xjc/dv</developerConnection>
>      </scm>
>  
>  </project>
> 
> Modified: incubator/cxf/trunk/tools2/xjc/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/po
> m.xml?view=diff&rev=518082&r1=518081&r2=518082
> ==============================================================
> ================
> --- incubator/cxf/trunk/tools2/xjc/pom.xml (original)
> +++ incubator/cxf/trunk/tools2/xjc/pom.xml Wed Mar 14 02:31:10 2007
> @@ -38,8 +38,8 @@
>      </modules>
>  
>      <scm>
> -        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools/xjc</connection>
> -        
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
> incubator/cxf/trunk/tools/xjc</developerConnection>
> +        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> cxf/trunk/tools2/xjc</connection>
> +        
> + 
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
> + r/cxf/trunk/tools2/xjc</developerConnection>
>      </scm>
>  
>  </project>
> 
> 
>