cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r956604 - in /cxf/trunk: api/pom.xml parent/pom.xml rt/databinding/jaxb/pom.xml
Date Mon, 21 Jun 2010 14:38:35 GMT
Author: dkulp
Date: Mon Jun 21 14:38:35 2010
New Revision: 956604

URL: http://svn.apache.org/viewvc?rev=956604&view=rev
Log:
Pull schemas from classpath instead of doing the unpack thing

Modified:
    cxf/trunk/api/pom.xml
    cxf/trunk/parent/pom.xml
    cxf/trunk/rt/databinding/jaxb/pom.xml

Modified: cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=956604&r1=956603&r2=956604&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Mon Jun 21 14:38:35 2010
@@ -89,29 +89,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-schemas</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/schemas</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.cxf</groupId>
-                                    <artifactId>cxf-common-schemas</artifactId>
-                                    <version>${project.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-xjc-plugin</artifactId>
                 <version>${cxf.xjc-utils.version}</version>
@@ -123,40 +100,41 @@
                             <goal>xsdtojava</goal>
                         </goals>
                         <configuration>
+                            <extensions>
+                                <extension>org.apache.cxf:cxf-common-schemas:${project.version}</extension>
+                                <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
+                            </extensions>
                             <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
                             <xsdOptions>
                                 <xsdOption>
-                                    <xsd>${basedir}/target/schemas/schemas/wsdl/http.xsd</xsd>
-                                    <bindingFile>${basedir}/target/schemas/schemas/wsdl/http.xjb</bindingFile>
+                                    <xsd>classpath:/schemas/wsdl/http.xsd</xsd>
+                                    <bindingFile>classpath:/schemas/wsdl/http.xjb</bindingFile>
                                     <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
-                                    <dependencies>
-                                        <dependency>${basedir}/target/schemas/schemas/wsdl/wsdl.xsd</dependency>
-                                    </dependencies>
                                 </xsdOption>
                                 <xsdOption>
-                                    <xsd>${basedir}/target/schemas/schemas/wsdl/ws-addr.xsd</xsd>
+                                    <xsd>classpath:/schemas/wsdl/ws-addr.xsd</xsd>
                                     <packagename>org.apache.cxf.ws.addressing</packagename>
                                 </xsdOption>
                                 <xsdOption>
-                                    <xsd>${basedir}/target/schemas/schemas/wsdl/addressing.xsd</xsd>
-                                    <bindingFile>${basedir}/target/schemas/schemas/wsdl/addressing.xjb</bindingFile>
+                                    <xsd>classpath:/schemas/wsdl/addressing.xsd</xsd>
+                                    <bindingFile>classpath:/schemas/wsdl/addressing.xjb</bindingFile>
                                 </xsdOption>
                                 <xsdOption>
-                                    <xsd>${basedir}/target/schemas/schemas/configuration/security.xsd</xsd>
-                                    <bindingFile>${basedir}/target/schemas/schemas/configuration/security.xjb</bindingFile>
+                                    <xsd>classpath:/schemas/configuration/security.xsd</xsd>
+                                    <bindingFile>classpath:/schemas/configuration/security.xjb</bindingFile>
                                     <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
                                     <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>
+                                    <xsd>classpath:/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
+                                    <bindingFile>classpath:/schemas/wsdl/ws-addr-wsdl.xjb</bindingFile>
                                     <extension>true</extension>
                                 </xsdOption>
                                 <xsdOption>
-                                    <xsd>${basedir}/target/schemas/schemas/wsdl/addressing200403.xsd</xsd>
-                                    <bindingFile>${basedir}/target/schemas/schemas/wsdl/addressing200403.xjb</bindingFile>
+                                    <xsd>classpath:/schemas/wsdl/addressing200403.xsd</xsd>
+                                    <bindingFile>classpath:/schemas/wsdl/addressing200403.xjb</bindingFile>
                                 </xsdOption>
                             </xsdOptions>
                         </configuration>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=956604&r1=956603&r2=956604&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Mon Jun 21 14:38:35 2010
@@ -1320,6 +1320,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-eclipse-plugin</artifactId>
+                        <inherited>true</inherited>
                         <executions>
                             <execution>
                                 <id>setup.eclipse.project</id>

Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=956604&r1=956603&r2=956604&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Mon Jun 21 14:38:35 2010
@@ -33,29 +33,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-schemas</id>
-                        <phase>process-test-sources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/generated/src/test/resources</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.cxf</groupId>
-                                    <artifactId>cxf-common-schemas</artifactId>
-                                    <version>${project.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-xjc-plugin</artifactId>
                 <version>${cxf.xjc-utils.version}</version>



Mime
View raw message