cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r523609 - in /incubator/cxf/trunk: api/src/main/resources/META-INF/ codegen-plugin/src/main/resources/META-INF/ common/common/src/main/resources/META-INF/ common/schemas/src/main/appended-resources/ common/schemas/src/main/appended-resource...
Date Thu, 29 Mar 2007 07:51:36 GMT
Author: blin
Date: Thu Mar 29 00:51:34 2007
New Revision: 523609

URL: http://svn.apache.org/viewvc?view=rev&rev=523609
Log:
1. remove redundant ws-addr schema
2. use the NOTICE file generated by remote resources plugin, appended content if necessary


Added:
    incubator/cxf/trunk/common/schemas/src/main/appended-resources/
    incubator/cxf/trunk/common/schemas/src/main/appended-resources/META-INF/
    incubator/cxf/trunk/common/schemas/src/main/appended-resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/appended-resources/
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/appended-resources/META-INF/
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/appended-resources/META-INF/NOTICE
Removed:
    incubator/cxf/trunk/api/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/codegen-plugin/src/main/resources/META-INF/
    incubator/cxf/trunk/common/common/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/
    incubator/cxf/trunk/common/xjc/dv/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/distribution/src/main/release/NOTICE
    incubator/cxf/trunk/distribution/src/main/release/samples/callback/wsdl/ws-addr.xsd
    incubator/cxf/trunk/distribution/src/main/resources/
    incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/integration/jca/src/main/resources/META-INF/
    incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/core/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/META-INF/
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/frontend/js/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/
    incubator/cxf/trunk/rt/management/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/transports/local/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/ws/security/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/ws-addr.xsd
    incubator/cxf/trunk/tools/common/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/tools/eclipse-plugin/src/main/resources/NOTICE
    incubator/cxf/trunk/tools/eclipse3.1-plugin/src/main/resources/NOTICE
    incubator/cxf/trunk/tools/javato/src/main/resources/META-INF/
    incubator/cxf/trunk/tools/validator/src/main/resources/META-INF/
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/resources/META-INF/NOTICE
Modified:
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
    incubator/cxf/trunk/distribution/src/main/assembly/src.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/callback/wsdl/basic_callback.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/basic_callback_test.wsdl

Added: incubator/cxf/trunk/common/schemas/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/schemas/src/main/appended-resources/META-INF/NOTICE?view=auto&rev=523609
==============================================================================
--- incubator/cxf/trunk/common/schemas/src/main/appended-resources/META-INF/NOTICE (added)
+++ incubator/cxf/trunk/common/schemas/src/main/appended-resources/META-INF/NOTICE Thu Mar
29 00:51:34 2007
@@ -0,0 +1,12 @@
+This product also includes schemas and specification developed by:
+      - the W3C consortium (http://www.w3c.org)
+      (http://www.w3.org/XML/1998/namespace)
+      
+This product also includes WS-* schemas developed by International
+   Business Machines Corporation, Microsoft Corporation, BEA Systems, 
+   TIBCO Software, SAP AG, Sonic Software, and VeriSign
+   (http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd)
+   (http://schemas.xmlsoap.org/ws/2004/08/addressing/)
+   (http://schemas.xmlsoap.org/wsdl/http)
+   (http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm.xsd)
+   (http://www.w3.org/2005/08/addressing/ws-addr.xsd)

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=523609&r1=523608&r2=523609
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Thu Mar 29 00:51:34 2007
@@ -262,6 +262,7 @@
                                 <descriptor>src/main/assembly/bin.xml</descriptor>
                                 <descriptor>src/main/assembly/src.xml</descriptor>
                             </descriptors>
+                            <tarLongFileMode>gnu</tarLongFileMode>
                             <finalName>cxf-${pom.version}</finalName>
                         </configuration>
                     </execution>
@@ -313,6 +314,7 @@
                                         <filter token="CXF_VERSION" value="${pom.version}"
/>
                                     </filterset>
                                 </copy>
+                                <delete file="build.xml" />
                             </tasks>
                         </configuration>
                         <goals>

Modified: incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/bin.xml?view=diff&rev=523609&r1=523608&r2=523609
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Thu Mar 29 00:51:34 2007
@@ -34,10 +34,16 @@
 	         <include>DISCLAIMER</include>
 		 <include>LICENSE</include>
 		 <include>licenses/*.*</include>
-		 <include>NOTICE</include>
 		 <include>README</include>
              </includes>
 	 </fileSet>
+         <fileSet>
+             <directory>target/maven-shared-archive-resources/META-INF</directory>
+             <outputDirectory>cxf-${cxf.version}</outputDirectory>
+             <includes>
+                 <include>NOTICE</include>
+             </includes>
+         </fileSet>
 	 <fileSet>
 	     <directory>src/main/release/bin</directory>
 	     <outputDirectory>cxf-${cxf.version}/bin</outputDirectory>

Modified: incubator/cxf/trunk/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/src.xml?view=diff&rev=523609&r1=523608&r2=523609
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/src.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/src.xml Thu Mar 29 00:51:34 2007
@@ -34,11 +34,17 @@
 	         <include>DISCLAIMER</include>
 		 <include>LICENSE</include>
 		 <include>licenses/*.*</include>
-		 <include>NOTICE</include>
 		 <include>README</include>
 		 <include>BUILDING.txt</include>
              </includes>
 	 </fileSet>
+         <fileSet>
+             <directory>target/maven-shared-archive-resources/META-INF</directory>
+             <outputDirectory>cxf-${cxf.version}-src</outputDirectory>
+             <includes>
+                 <include>NOTICE</include>
+             </includes>
+         </fileSet>
 	 <fileSet>
 	     <directory>..</directory>
 	     <outputDirectory>cxf-${cxf.version}-src</outputDirectory>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/callback/wsdl/basic_callback.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/callback/wsdl/basic_callback.wsdl?view=diff&rev=523609&r1=523608&r2=523609
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/callback/wsdl/basic_callback.wsdl
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/callback/wsdl/basic_callback.wsdl
Thu Mar 29 00:51:34 2007
@@ -37,7 +37,7 @@
 		xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
 		jaxb:version="2.0">
 
-	    <xsd:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="ws-addr.xsd"/>
+	    <xsd:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="/schemas/wsdl/ws-addr.xsd"/>
 	    <element name="callback_message" type="xsd:string"/>
 	    <element name="RegisterCallback" type="references:EndpointReferenceType"/>
 	    <element name="returnType" type="xsd:string"/>

Added: incubator/cxf/trunk/rt/frontend/jaxws/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/appended-resources/META-INF/NOTICE?view=auto&rev=523609
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/appended-resources/META-INF/NOTICE (added)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/appended-resources/META-INF/NOTICE Thu
Mar 29 00:51:34 2007
@@ -0,0 +1,3 @@
+Java classes (source and binary) under org.apache.cxf.jaxws.javaee
+are generated from schema available here:
+(http://java.sun.com/xml/ns/javaee/javaee_5.xsd)

Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/basic_callback_test.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/basic_callback_test.wsdl?view=diff&rev=523609&r1=523608&r2=523609
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/basic_callback_test.wsdl (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/basic_callback_test.wsdl Thu Mar
29 00:51:34 2007
@@ -37,7 +37,7 @@
 		jaxb:version="2.0"
 		elementFormDefault="qualified">
 
-	    <xsd:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="ws-addr.xsd"/>
+	    <xsd:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="/schemas/wsdl/ws-addr.xsd"/>
 	    <element name="callback_message" type="xsd:string"/>
 	    <element name="RegisterCallback" type="references:EndpointReferenceType"/>
 	    <element name="returnType" type="xsd:string"/>



Mime
View raw message