cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r542743 - in /incubator/cxf/trunk: rt/bindings/jbi/ rt/bindings/jbi/src/main/resources/schemas/ rt/bindings/jbi/src/main/resources/schemas/wsdl/ tools/common/ tools/common/src/main/resources/schemas/wsdl/ tools/common/src/test/java/org/apac...
Date Wed, 30 May 2007 03:46:46 GMT
Author: mmao
Date: Tue May 29 20:46:44 2007
New Revision: 542743

URL: http://svn.apache.org/viewvc?view=rev&rev=542743
Log:
* Remove jbi stuff out of tools/common
* Added jbi schemas into rt/bindings/jbi
* Clean up pom(s)


Added:
    incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/
    incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/
    incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb
      - copied, changed from r542713, incubator/cxf/trunk/tools/common/src/main/resources/schemas/wsdl/jbi.xjb
    incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd
      - copied, changed from r542713, incubator/cxf/trunk/tools/common/src/main/resources/schemas/wsdl/jbi.xsd
    incubator/cxf/trunk/tools/common/src/test/resources/
    incubator/cxf/trunk/tools/common/src/test/resources/schemas/
    incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/
    incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
Removed:
    incubator/cxf/trunk/tools/common/src/main/resources/schemas/wsdl/jbi.xjb
    incubator/cxf/trunk/tools/common/src/main/resources/schemas/wsdl/jbi.xsd
Modified:
    incubator/cxf/trunk/rt/bindings/jbi/pom.xml
    incubator/cxf/trunk/tools/common/pom.xml
    incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
    incubator/cxf/trunk/tools/validator/pom.xml

Modified: incubator/cxf/trunk/rt/bindings/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/pom.xml?view=diff&rev=542743&r1=542742&r2=542743
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/pom.xml Tue May 29 20:46:44 2007
@@ -85,6 +85,38 @@
         </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/jbi.xsd</xsd>
+    			        <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jbi.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>    
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/bindings/jbi</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/bindings/jbi</developerConnection>

Copied: incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb (from
r542713, incubator/cxf/trunk/tools/common/src/main/resources/schemas/wsdl/jbi.xjb)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb?view=diff&rev=542743&p1=incubator/cxf/trunk/tools/common/src/main/resources/schemas/wsdl/jbi.xjb&r1=542713&p2=incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb&r2=542743
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/resources/schemas/wsdl/jbi.xjb (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb Tue May 29
20:46:44 2007
@@ -22,13 +22,13 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema" 
   xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" 
   jaxb:extensionBindingPrefixes="xjc">
-    <jaxb:bindings schemaLocation="../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema">
+    <jaxb:bindings schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema">
         <jaxb:schemaBindings>
             <jaxb:package name="org.apache.cxf.wsdl"/>
         </jaxb:schemaBindings>
         <jaxb:globalBindings generateIsSetMethod="true"/>
     </jaxb:bindings>
-    <jaxb:bindings schemaLocation="../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema/xs:complexType[@name='tExtensibilityElement']">
+    <jaxb:bindings schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema/xs:complexType[@name='tExtensibilityElement']">
         <jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
     </jaxb:bindings>
 </jaxb:bindings>

Copied: incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd (from
r542713, incubator/cxf/trunk/tools/common/src/main/resources/schemas/wsdl/jbi.xsd)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd?view=diff&rev=542743&p1=incubator/cxf/trunk/tools/common/src/main/resources/schemas/wsdl/jbi.xsd&r1=542713&p2=incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd&r2=542743
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/resources/schemas/wsdl/jbi.xsd (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd Tue May 29
20:46:44 2007
@@ -25,7 +25,7 @@
   xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0">
   
   <xs:import namespace="http://schemas.xmlsoap.org/wsdl/"
-    schemaLocation="../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
/>
+    schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
/>
   
   <xs:complexType name="JBIFormatBinding">
     <xs:complexContent>

Modified: incubator/cxf/trunk/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/pom.xml?view=diff&rev=542743&r1=542742&r2=542743
==============================================================================
--- incubator/cxf/trunk/tools/common/pom.xml (original)
+++ incubator/cxf/trunk/tools/common/pom.xml Tue May 29 20:46:44 2007
@@ -72,28 +72,11 @@
 	</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>
 
 
@@ -103,36 +86,4 @@
       <url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-tools-common</url>
   </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/jbi.xsd</xsd>
-    			        <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jbi.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/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java?view=diff&rev=542743&r1=542742&r2=542743
==============================================================================
--- incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
(original)
+++ incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
Tue May 29 20:46:44 2007
@@ -61,7 +61,7 @@
         assertTrue(uri2.contains(uri));
         assertTrue(uri2.contains(new java.io.File("").toString()));
 
-        uri = getClass().getResource("/schemas/wsdl/jbi.xsd").toString();
+        uri = getClass().getResource("/schemas/wsdl/test.xsd").toString();
         uri2 = URIParserUtil.getAbsoluteURI(uri);
         assertNotNull(uri2);
         assertTrue(uri2.startsWith("file"));

Added: incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd?view=auto&rev=542743
==============================================================================
--- incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd (added)
+++ incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd Tue May 29 20:46:44
2007
@@ -0,0 +1,40 @@
+<?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.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:jbi="http://cxf.apache.org/bindings/jbi"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  targetNamespace="http://cxf.apache.org/bindings/jbi"
+  elementFormDefault="qualified"
+  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0">
+  
+  <xs:import namespace="http://schemas.xmlsoap.org/wsdl/"
+    schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
/>
+  
+  <xs:complexType name="JBIFormatBinding">
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement">
+        <xs:sequence />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:element name="binding" type="jbi:JBIFormatBinding"/>
+  
+</xs:schema>

Modified: incubator/cxf/trunk/tools/validator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/pom.xml?view=diff&rev=542743&r1=542742&r2=542743
==============================================================================
--- incubator/cxf/trunk/tools/validator/pom.xml (original)
+++ incubator/cxf/trunk/tools/validator/pom.xml Tue May 29 20:46:44 2007
@@ -100,6 +100,19 @@
             <artifactId>stax-api</artifactId>
         </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>



Mime
View raw message