cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r520805 - in /incubator/cxf/trunk: ./ api/ api/src/main/java/org/apache/cxf/wsdl/ api/src/main/resources/META-INF/cxf/ common/schemas/src/main/resources/schemas/wsdl/ distribution/ metacode/src/main/java/org/apache/cxf/wsdl/ metacode/src/ma...
Date Wed, 21 Mar 2007 08:44:53 GMT
Author: mmao
Date: Wed Mar 21 01:44:52 2007
New Revision: 520805

URL: http://svn.apache.org/viewvc?view=rev&rev=520805
Log:
* merge metacode into api
* remove xml-binding.xsd and jms.xsd which has been moved to tools/common 

Added:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java
      - copied unchanged from r520729, incubator/cxf/trunk/metacode/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java
    incubator/cxf/trunk/api/src/main/resources/META-INF/cxf/
      - copied from r520729, incubator/cxf/trunk/metacode/src/main/resources/META-INF/cxf/
Removed:
    incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/jms.xsd
    incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/xml-binding.xsd
    incubator/cxf/trunk/metacode/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java
    incubator/cxf/trunk/metacode/src/main/resources/META-INF/cxf/
Modified:
    incubator/cxf/trunk/api/pom.xml
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/testutils/pom.xml

Modified: incubator/cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/pom.xml?view=diff&rev=520805&r1=520804&r2=520805
==============================================================================
--- incubator/cxf/trunk/api/pom.xml (original)
+++ incubator/cxf/trunk/api/pom.xml Wed Mar 21 01:44:52 2007
@@ -55,11 +55,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-metacode</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.ws.commons.schema</groupId>
             <artifactId>XmlSchema</artifactId>
         </dependency>
@@ -86,6 +81,17 @@
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <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>
@@ -113,11 +119,73 @@
                 </configuration>
             </plugin>
             <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-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}/target/schemas/schemas/wsdl/http.xsd</xsd>
+                                    <bindingFile>${basedir}/target/schemas/schemas/wsdl/wsdl.xjb</bindingFile>
+                                    <dependencies>
+                                        <dependency>${basedir}/target/schemas/schemas/wsdl/wsdl.xsd</dependency>
+                                    </dependencies>
+                                </xsdOption>
+                                <xsdOption>
+                                    <xsd>${basedir}/target/schemas/schemas/wsdl/ws-addr.xsd</xsd>
+                                    <packagename>org.apache.cxf.ws.addressing</packagename>
+                                </xsdOption>
+                                <xsdOption>
+                                    <xsd>${basedir}/target/schemas/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
+                                    <packagename>org.apache.cxf.ws.addressing.wsdl</packagename>
+                                </xsdOption>
+                                <xsdOption>
+                                    <xsd>${basedir}/target/schemas/schemas/wsdl/addressing.xsd</xsd>
+                                    <bindingFile>${basedir}/target/schemas/schemas/wsdl/addressing.xjb</bindingFile>
+                                </xsdOption>
+                                <xsdOption>
+                                    <xsd>${basedir}/target/schemas/schemas/configuration/std-types.xsd</xsd>
+                                </xsdOption>
+                                <xsdOption>
+                                    <xsd>${basedir}/target/schemas/schemas/configuration/security.xsd</xsd>
+                                    <bindingFile>${basedir}/target/schemas/schemas/configuration/security.xjb</bindingFile>
+                                </xsdOption>
+                            </xsdOptions>
+                        </configuration>
+                        <goals>
+                            <goal>xsdtojava</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
                         <id>generate-test-sources</id>
                         <phase>generate-test-sources</phase>
                         <configuration>
@@ -139,7 +207,21 @@
                             <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>
             </plugin>
         </plugins>
     </build>

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=520805&r1=520804&r2=520805
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Wed Mar 21 01:44:52 2007
@@ -50,11 +50,6 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-metacode</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-tools-common</artifactId>
             <version>${pom.version}</version>
         </dependency>

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=520805&r1=520804&r2=520805
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Wed Mar 21 01:44:52 2007
@@ -130,7 +130,6 @@
         <module>parent</module>
         <module>common</module>
         <module>api</module>
-        <module>metacode</module>
         <module>tools</module>
         <module>codegen-plugin</module>
         <module>testutils</module>

Modified: incubator/cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom.xml?view=diff&rev=520805&r1=520804&r2=520805
==============================================================================
--- incubator/cxf/trunk/testutils/pom.xml (original)
+++ incubator/cxf/trunk/testutils/pom.xml Wed Mar 21 01:44:52 2007
@@ -174,11 +174,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>



Mime
View raw message