cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r907070 - in /cxf/trunk: ./ api/ common/ common/xjc/ common/xsd/ distribution/ distribution/manifest/ distribution/src/main/assembly/ maven-plugins/xml2fastinfoset-plugin/ maven-plugins/xml2fastinfoset-test/ parent/ rt/bindings/corba/ rt/bi...
Date Fri, 05 Feb 2010 19:48:01 GMT
Author: dkulp
Date: Fri Feb  5 19:48:00 2010
New Revision: 907070

URL: http://svn.apache.org/viewvc?rev=907070&view=rev
Log:
Use new versions of stuff in cxf-build-utils and cxf-xjc-plugins

Added:
    cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xjb   (with props)
Removed:
    cxf/trunk/common/xjc/
    cxf/trunk/common/xsd/
    cxf/trunk/maven-plugins/xml2fastinfoset-plugin/
    cxf/trunk/maven-plugins/xml2fastinfoset-test/
Modified:
    cxf/trunk/api/pom.xml
    cxf/trunk/common/pom.xml
    cxf/trunk/distribution/manifest/pom.xml
    cxf/trunk/distribution/pom.xml
    cxf/trunk/distribution/src/main/assembly/bin.xml
    cxf/trunk/parent/pom.xml
    cxf/trunk/pom.xml
    cxf/trunk/rt/bindings/corba/pom.xml
    cxf/trunk/rt/bindings/http/pom.xml
    cxf/trunk/rt/bindings/jbi/pom.xml
    cxf/trunk/rt/bindings/xml/pom.xml
    cxf/trunk/rt/databinding/jaxb/pom.xml
    cxf/trunk/rt/management/pom.xml
    cxf/trunk/rt/transports/http-jetty/pom.xml
    cxf/trunk/rt/transports/http/pom.xml
    cxf/trunk/rt/transports/jbi/pom.xml
    cxf/trunk/rt/transports/jms/pom.xml
    cxf/trunk/rt/ws/policy/pom.xml
    cxf/trunk/rt/ws/rm/pom.xml
    cxf/trunk/systests/transports/pom.xml
    cxf/trunk/testutils/pom.xml
    cxf/trunk/tools/wsdlto/core/pom.xml

Modified: cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Fri Feb  5 19:48:00 2010
@@ -79,8 +79,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-	  <groupId>${stax.impl.groupId}</groupId>
-	  <artifactId>${stax.impl.artifactId}</artifactId>
+            <groupId>${stax.impl.groupId}</groupId>
+            <artifactId>${stax.impl.artifactId}</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.neethi</groupId>
@@ -91,12 +91,6 @@
             <artifactId>cxf-common-schemas</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-xjc-dv</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -126,12 +120,15 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
                         <phase>generate-sources</phase>
+                        <goals>
+                            <goal>xsdtojava</goal>
+                        </goals>
                         <configuration>
                             <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
                             <xsdOptions>
@@ -156,28 +153,27 @@
                                     <bindingFile>${basedir}/target/schemas/schemas/configuration/security.xjb</bindingFile>
                                     <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
                                     <extensionArgs>
-                                         <extensionArg>-Xdv</extensionArg>
-                                     </extensionArgs>
+                                        <extensionArg>-Xdv</extensionArg>
+                                    </extensionArgs>
                                 </xsdOption>
                                 <xsdOption>
                                     <xsd>${basedir}/target/schemas/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
                                     <bindingFile>${basedir}/target/schemas/schemas/wsdl/ws-addr-wsdl.xjb</bindingFile>
                                     <extension>true</extension>
                                 </xsdOption>
-                                   <xsdOption>
+                                <xsdOption>
                                     <xsd>${basedir}/target/schemas/schemas/wsdl/addressing200403.xsd</xsd>
                                     <bindingFile>${basedir}/target/schemas/schemas/wsdl/addressing200403.xjb</bindingFile>
                                 </xsdOption>
                             </xsdOptions>
                         </configuration>
-                        <goals>
-                            <goal>xsdtojava</goal>
-                        </goals>
                     </execution>
-
                     <execution>
                         <id>generate-test-sources</id>
                         <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>xsdtojava-tests</goal>
+                        </goals>
                         <configuration>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                             <xsdOptions>
@@ -194,48 +190,38 @@
                                 </xsdOption>
                             </xsdOptions>
                         </configuration>
-                        <goals>
-                            <goal>xsdtojava</goal>
-                        </goals>
                     </execution>
 
                 </executions>
 
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-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>
+                <configuration>
+                    <extensions>
+                        <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
+                    </extensions>
+                </configuration>
             </plugin>
         </plugins>
 
         <pluginManagement>
-             <plugins>
-                 <plugin>
-                     <groupId>org.apache.maven.plugins</groupId>
-                     <artifactId>maven-javadoc-plugin</artifactId>
-                     <executions>
-                         <execution>
-                             <id>package</id>
-                             <phase>package</phase>
-                             <goals>
-                                 <goal>jar</goal>
-                             </goals>
-                         </execution>
-                     </executions>
-                     <configuration>
-                         <header>Apache CXF API</header>
-                         <footer>Apache CXF API</footer>
-                     </configuration>
-                 </plugin>
-             </plugins>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>package</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <header>Apache CXF API</header>
+                        <footer>Apache CXF API</footer>
+                    </configuration>
+                </plugin>
+            </plugins>
         </pluginManagement>
     </build>
 

Modified: cxf/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/common/pom.xml (original)
+++ cxf/trunk/common/pom.xml Fri Feb  5 19:48:00 2010
@@ -33,9 +33,7 @@
 
     <modules>
         <module>common</module>
-        <module>xsd</module>
         <module>schemas</module>
-        <module>xjc</module>
         <module>wstx-msv-validation</module>
         <module>xerces-xsd-validation</module>
     </modules>

Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Fri Feb  5 19:48:00 2010
@@ -99,24 +99,24 @@
         </dependency>       
         
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${pom.groupId}.xjcplugins</groupId>
             <artifactId>cxf-xjc-dv</artifactId>
-            <version>${pom.version}</version>
+            <version>${cxf.xjc-utils.version}</version>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${pom.groupId}.xjcplugins</groupId>
             <artifactId>cxf-xjc-ts</artifactId>
-            <version>${pom.version}</version>
+            <version>${cxf.xjc-utils.version}</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}.xjcplugins</groupId>
             <artifactId>cxf-xjc-bug671</artifactId>
-            <version>${pom.version}</version>
+            <version>${cxf.xjc-utils.version}</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}.xjcplugins</groupId>
             <artifactId>cxf-xjc-boolean</artifactId>
-            <version>${pom.version}</version>
+            <version>${cxf.xjc-utils.version}</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>

Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Fri Feb  5 19:48:00 2010
@@ -104,24 +104,24 @@
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${pom.groupId}.xjcplugins</groupId>
             <artifactId>cxf-xjc-dv</artifactId>
-            <version>${pom.version}</version>
+            <version>${cxf.xjc-utils.version}</version>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${pom.groupId}.xjcplugins</groupId>
             <artifactId>cxf-xjc-ts</artifactId>
-            <version>${pom.version}</version>
+            <version>${cxf.xjc-utils.version}</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}.xjcplugins</groupId>
             <artifactId>cxf-xjc-bug671</artifactId>
-            <version>${pom.version}</version>
+            <version>${cxf.xjc-utils.version}</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}.xjcplugins</groupId>
             <artifactId>cxf-xjc-boolean</artifactId>
-            <version>${pom.version}</version>
+            <version>${cxf.xjc-utils.version}</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>

Modified: cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/assembly/bin.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ cxf/trunk/distribution/src/main/assembly/bin.xml Fri Feb  5 19:48:00 2010
@@ -158,15 +158,6 @@
             <scope>runtime</scope>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.cxf:cxf-xjc-ts</include>
-                <include>org.apache.cxf:cxf-xjc-dv</include>
-            </includes>
-            <scope>runtime</scope>
-        </dependencySet>
-        <dependencySet>
             <outputDirectory>apache-cxf-${cxf.version}/modules</outputDirectory>
             <unpack>false</unpack>
             <includes>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Feb  5 19:48:00 2010
@@ -168,9 +168,9 @@
                     <version>2.3</version>
                     <dependencies>
                         <dependency>
-                            <groupId>org.apache.cxf</groupId>
+                            <groupId>org.apache.cxf.build-utils</groupId>
                             <artifactId>cxf-buildtools</artifactId>
-                            <version>${project.version}</version>
+                            <version>${cxf.build-utils.version}</version>
                         </dependency>
                         <dependency>
                             <groupId>org.codehaus.plexus</groupId>
@@ -217,9 +217,9 @@
                     <version>2.4</version>
                     <dependencies>
                         <dependency>
-                            <groupId>org.apache.cxf</groupId>
+                            <groupId>org.apache.cxf.build-utils</groupId>
                             <artifactId>cxf-buildtools</artifactId>
-                            <version>${project.version}</version>
+                            <version>${cxf.build-utils.version}</version>
                         </dependency>
                     </dependencies>
                     <configuration>
@@ -286,9 +286,9 @@
         </pluginManagement>
         <plugins>
             <plugin>
-                <groupId>org.apache.cxf</groupId>
+                <groupId>org.apache.cxf.build-utils</groupId>
                 <artifactId>cxf-xml2fastinfoset-plugin</artifactId>
-                <version>${project.version}</version>
+                <version>${cxf.build-utils.version}</version>
                 <configuration>
                     <includes>
                         <include>META-INF/cxf/cxf*.xml</include>
@@ -310,9 +310,9 @@
                 <version>1.0</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.cxf</groupId>
+                        <groupId>org.apache.cxf.build-utils</groupId>
                         <artifactId>cxf-buildtools</artifactId>
-                        <version>${project.version}</version>
+                        <version>${cxf.build-utils.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -1386,21 +1386,6 @@
             </build>
         </profile>
     </profiles>
-    <repositories>
-        <repository>
-            <id>codehaus-snapshots</id>
-            <name>Codehaus Snapshots Repository</name>
-            <url>http://snapshots.repository.codehaus.org</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository> 
-    </repositories>
-
-
 </project>
 
 

Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Fri Feb  5 19:48:00 2010
@@ -42,6 +42,8 @@
 
     <properties>
         <compiler.fork>false</compiler.fork>
+        <cxf.build-utils.version>2.3.0-SNAPSHOT</cxf.build-utils.version>
+        <cxf.xjc-utils.version>2.3.0-SNAPSHOT</cxf.xjc-utils.version>
     </properties>
 
     <distributionManagement>
@@ -61,6 +63,31 @@
             <url>scpexe://people.apache.org/www/cxf.apache.org/cxf/mvn_site</url>
         </site>
     </distributionManagement>
+    <repositories>
+          <repository>
+              <id>apache.snapshots</id>
+              <url>http://repository.apache.org/snapshots/</url>
+              <name>Apache Snapshot Repo</name>
+             <snapshots>
+                 <enabled>true</enabled>
+             </snapshots>
+             <releases>
+                 <enabled>false</enabled>
+             </releases>
+         </repository> 
+     </repositories>
+    <pluginRepositories>
+         <pluginRepository>
+             <id>apache.snapshots</id>
+             <url>http://repository.apache.org/snapshots/</url>
+             <snapshots>
+                 <enabled>true</enabled>
+             </snapshots>
+             <releases>
+                 <enabled>false</enabled>
+             </releases>
+         </pluginRepository>
+     </pluginRepositories>
 
     <inceptionYear>2006</inceptionYear>
     <mailingLists>
@@ -125,8 +152,6 @@
     </organization>
 
     <modules>
-        <module>buildtools</module>
-        <module>maven-plugins/xml2fastinfoset-plugin</module>
         <module>parent</module>
         <module>common</module>
         <module>api</module>
@@ -189,9 +214,9 @@
                                 <version>1.6.5</version>
                             </dependency>
                             <dependency>
-                                <groupId>org.apache.cxf</groupId>
+                                <groupId>org.apache.cxf.buildutils</groupId>
                                 <artifactId>cxf-buildtools</artifactId>
-                                <version>${project.version}</version>
+                                <version>${cxf.build-utils.version}</version>
                             </dependency>
                         </dependencies>
                         <executions>
@@ -508,9 +533,9 @@
                     <version>2.7</version>
                     <dependencies>
                         <dependency>
-                            <groupId>org.apache.cxf</groupId>
+                            <groupId>org.apache.cxf.build-utils</groupId>
                             <artifactId>cxf-buildtools</artifactId>
-                            <version>${project.version}</version>
+                            <version>${cxf.build-utils.version}</version>
                         </dependency>
                     </dependencies>
                 </plugin>

Modified: cxf/trunk/rt/bindings/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/pom.xml (original)
+++ cxf/trunk/rt/bindings/corba/pom.xml Fri Feb  5 19:48:00 2010
@@ -72,8 +72,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>

Modified: cxf/trunk/rt/bindings/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/http/pom.xml (original)
+++ cxf/trunk/rt/bindings/http/pom.xml Fri Feb  5 19:48:00 2010
@@ -111,8 +111,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>

Modified: cxf/trunk/rt/bindings/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/pom.xml (original)
+++ cxf/trunk/rt/bindings/jbi/pom.xml Fri Feb  5 19:48:00 2010
@@ -81,80 +81,81 @@
     </dependencies>
 
     <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/jbi.xsd</xsd>
-    			        <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jbi.xjb</bindingFile>
-                        <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
-    			        <deleteDirs>
-      			          <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
-    			        </deleteDirs>
-  			      </xsdOption>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.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/jbi.xsd</xsd>
+                                    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jbi.xjb</bindingFile>
+                                    <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
+                                    <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>
-        <plugin>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>maven-bundle-plugin</artifactId>
-            <executions>
-                <execution>
-                    <id>bundle-manifest</id>
-                    <phase>process-classes</phase>
-                    <goals>
-                        <goal>manifest</goal>
-                    </goals>
-                </execution>
-            </executions>
-            <configuration>
-                <instructions>
-                    <Implementation-Title>Apache CXF</Implementation-Title>
-                    <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
-                    <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-                    <Implementation-Version>${pom.version}</Implementation-Version>
-                    <Specification-Title>Apache CXF</Specification-Title>
-                    <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-                    <Specification-Version>${pom.version}</Specification-Version>
-                    <DynamicImport-Package>
-                    </DynamicImport-Package>
-                    <Import-Package>
+
+                            </xsdOptions>
+                        </configuration>
+                        <goals>
+                            <goal>xsdtojava</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <instructions>
+                        <Implementation-Title>Apache CXF</Implementation-Title>
+                        <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+                        <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                        <Implementation-Version>${pom.version}</Implementation-Version>
+                        <Specification-Title>Apache CXF</Specification-Title>
+                        <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+                        <Specification-Version>${pom.version}</Specification-Version>
+                        <DynamicImport-Package>
+                        </DynamicImport-Package>
+                        <Import-Package>
                         *
-                    </Import-Package>
-                    <Export-Package>
+                        </Import-Package>
+                        <Export-Package>
                         org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
                         META-INF.cxf.binding.jbi
-                    </Export-Package>
-                    <_failok>true</_failok>
-                </instructions>
-            </configuration>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-                <archive>
-                    <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                </archive>
-            </configuration>
-        </plugin>
-	</plugins>
-    </build>    
+                        </Export-Package>
+                        <_failok>true</_failok>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 
 </project>

Modified: cxf/trunk/rt/bindings/xml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/pom.xml (original)
+++ cxf/trunk/rt/bindings/xml/pom.xml Fri Feb  5 19:48:00 2010
@@ -72,38 +72,39 @@
             <scope>test</scope>
         </dependency>
         
+
     </dependencies>
 
     <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>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.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>
                                     <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
-				    <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>
+                                    <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: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Fri Feb  5 19:48:00 2010
@@ -57,8 +57,8 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -75,22 +75,10 @@
                             </xsdOptions>
                         </configuration>
                         <goals>
-                            <goal>xsdtojava</goal>
+                            <goal>xsdtojava-tests</goal>
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-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>
         </plugins>
     </build>
@@ -122,6 +110,7 @@
             <version>${project.version}</version>
         </dependency>
        
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
@@ -139,8 +128,8 @@
         </dependency>
 
         <dependency>
-	    <groupId>${stax.impl.groupId}</groupId>
-	    <artifactId>${stax.impl.artifactId}</artifactId>
+            <groupId>${stax.impl.groupId}</groupId>
+            <artifactId>${stax.impl.artifactId}</artifactId>
         </dependency>
 
 
@@ -157,7 +146,7 @@
             <artifactId>asm</artifactId>
             <optional>true</optional>
         </dependency>
-	 <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxws_2.1_spec</artifactId>
             <scope>test</scope>

Modified: cxf/trunk/rt/management/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/management/pom.xml (original)
+++ cxf/trunk/rt/management/pom.xml Fri Feb  5 19:48:00 2010
@@ -66,6 +66,7 @@
             <scope>test</scope>
         </dependency>
         
+
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
@@ -77,8 +78,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -100,18 +101,11 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-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>
+                <configuration>
+                     <extensions>
+                         <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
+                     </extensions>
+                 </configuration>
             </plugin>
 
         </plugins>

Modified: cxf/trunk/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/pom.xml Fri Feb  5 19:48:00 2010
@@ -100,8 +100,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -125,18 +125,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-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>
         </plugins>
     </build>

Modified: cxf/trunk/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/pom.xml (original)
+++ cxf/trunk/rt/transports/http/pom.xml Fri Feb  5 19:48:00 2010
@@ -74,8 +74,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -101,18 +101,11 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-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>
+                <configuration>
+                     <extensions>
+                         <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
+                     </extensions>
+                 </configuration>
             </plugin>
         </plugins>
     </build>

Modified: cxf/trunk/rt/transports/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jbi/pom.xml (original)
+++ cxf/trunk/rt/transports/jbi/pom.xml Fri Feb  5 19:48:00 2010
@@ -75,8 +75,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>

Modified: cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Fri Feb  5 19:48:00 2010
@@ -140,8 +140,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -168,6 +168,13 @@
                                         <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
                                     </deleteDirs>
                                 </xsdOption>
+                                <xsdOption>
+                                    <xsd>${basedir}/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd</xsd>
+                                    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xjb</bindingFile>
+                                    <extensionArgs>
+                                         <extensionArg>-Xwsdlextension</extensionArg>
+                                     </extensionArgs>
+                                </xsdOption>
                             </xsdOptions>
                         </configuration>
                         <goals>
@@ -175,58 +182,12 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-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.codehaus.mojo</groupId>
-                <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>1.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xjc</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
-                	<clearOutputDir>false</clearOutputDir> 
-                	<packageName>org.apache.cxf.transport.jms.wsdl</packageName>
-                    <outputDirectory>${basedir}/target/generated/src/main/java</outputDirectory>
-                    <schemaDirectory>${basedir}/src/main/resources/schemas/wsdl/spec</schemaDirectory>
-                    <schemaFiles>jms-spec-wsdl.xsd</schemaFiles>
-                    <arguments>-Xwsdlextension</arguments>
-                    <extension>true</extension>
-                    <quiet>true</quiet>
-                </configuration>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-xjc-dv</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-xjc-ts</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-xjc-wsdlextension</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
+                     <extensions>
+                         <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
+                         <extension>org.apache.cxf.xjcplugins:cxf-xjc-wsdlextension:${cxf.xjc-utils.version}</extension>
+                     </extensions>
+                 </configuration>
             </plugin>
         </plugins>
     </build>

Added: cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xjb
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xjb?rev=907070&view=auto
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xjb (added)
+++ cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xjb Fri Feb  5 19:48:00 2010
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  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.
+-->
+<jaxb:bindings version="1.0" 
+  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" 
+  jaxb:extensionBindingPrefixes="xjc">
+    <jaxb:bindings schemaLocation="jms-spec-wsdl.xsd" node="/xs:schema">
+        <jaxb:schemaBindings>
+            <jaxb:package name="org.apache.cxf.transport.jms.wsdl"/>
+        </jaxb:schemaBindings>
+    </jaxb:bindings>
+</jaxb:bindings>

Propchange: cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xjb
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xjb
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xjb
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/trunk/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/pom.xml (original)
+++ cxf/trunk/rt/ws/policy/pom.xml Fri Feb  5 19:48:00 2010
@@ -92,8 +92,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>

Modified: cxf/trunk/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/pom.xml (original)
+++ cxf/trunk/rt/ws/rm/pom.xml Fri Feb  5 19:48:00 2010
@@ -92,8 +92,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -125,18 +125,11 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-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>
+                <configuration>
+                     <extensions>
+                         <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
+                     </extensions>
+                 </configuration>
             </plugin>
         </plugins>
     </build>

Modified: cxf/trunk/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/systests/transports/pom.xml (original)
+++ cxf/trunk/systests/transports/pom.xml Fri Feb  5 19:48:00 2010
@@ -63,8 +63,8 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>

Modified: cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/testutils/pom.xml (original)
+++ cxf/trunk/testutils/pom.xml Fri Feb  5 19:48:00 2010
@@ -252,8 +252,8 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -275,18 +275,11 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-xjc-dv</artifactId>
-                        <version>${version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-common-utilities</artifactId>
-                        <version>${version}</version>
-                    </dependency>
-                </dependencies>
+                <configuration>
+                     <extensions>
+                         <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
+                     </extensions>
+                 </configuration>
             </plugin>
         </plugins>
     </build>

Modified: cxf/trunk/tools/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/pom.xml?rev=907070&r1=907069&r2=907070&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/pom.xml (original)
+++ cxf/trunk/tools/wsdlto/core/pom.xml Fri Feb  5 19:48:00 2010
@@ -118,8 +118,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common-xsd</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf.xjc-utils.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>



Mime
View raw message