cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1025805 - in /cxf/branches/2.3.x-fixes: ./ api/ systests/uncategorized/ systests/uncategorized/src/test/resources/META-INF/ systests/uncategorized/src/test/resources/wsdl_systest/
Date Thu, 21 Oct 2010 01:02:46 GMT
Author: ffang
Date: Thu Oct 21 01:02:46 2010
New Revision: 1025805

URL: http://svn.apache.org/viewvc?rev=1025805&view=rev
Log:
Merged revisions 1025804 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1025804 | ffang | 2010-10-21 08:53:55 +0800 (四, 21 10 2010) | 1 line
  
  [CXF-3076]add catalog to avoid download schema files remotely
........

Added:
    cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/resources/wsdl_systest/catalog.xml
      - copied unchanged from r1025804, cxf/trunk/systests/uncategorized/src/test/resources/wsdl_systest/catalog.xml
    cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/resources/wsdl_systest/envelope.xsd
      - copied unchanged from r1025804, cxf/trunk/systests/uncategorized/src/test/resources/wsdl_systest/envelope.xsd
Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/api/pom.xml
    cxf/branches/2.3.x-fixes/systests/uncategorized/pom.xml
    cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/resources/META-INF/jax-ws-catalog.xml

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Oct 21 01:02:46 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023804,1023971-1023973,1024006,1024070,1024487,1024489,1025679,1025683
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023804,1023971-1023973,1024006,1024070,1024487,1024489,1025679,1025683,1025804

Modified: cxf/branches/2.3.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/pom.xml?rev=1025805&r1=1025804&r2=1025805&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/api/pom.xml Thu Oct 21 01:02:46 2010
@@ -89,6 +89,29 @@
     <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>

Modified: cxf/branches/2.3.x-fixes/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/uncategorized/pom.xml?rev=1025805&r1=1025804&r2=1025805&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/uncategorized/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/systests/uncategorized/pom.xml Thu Oct 21 01:02:46 2010
@@ -47,6 +47,10 @@
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/test/resources/wsdl_systest/hello_world_corba.wsdl</wsdl>
                                 </wsdlOption>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/src/test/resources/wsdl_systest/soap_fault.wsdl</wsdl>
+                                    <catalog>${basedir}/src/test/resources/wsdl_systest/catalog.xml</catalog>
+                                </wsdlOption>
                             </wsdlOptions>
                         </configuration>
                         <goals>

Modified: cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/resources/META-INF/jax-ws-catalog.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/resources/META-INF/jax-ws-catalog.xml?rev=1025805&r1=1025804&r2=1025805&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/resources/META-INF/jax-ws-catalog.xml
(original)
+++ cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/resources/META-INF/jax-ws-catalog.xml
Thu Oct 21 01:02:46 2010
@@ -20,4 +20,5 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
     <rewriteSystem systemIdStartString="http://www.w3.org/2006/03/addressing" rewritePrefix="classpath:/schemas/wsdl"/>
     <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing" rewritePrefix="classpath:/schemas/wsdl"/>
+    <rewriteURI rewritePrefix="../wsdl_systest/envelope.xsd" uriStartString="http://schemas.xmlsoap.org/soap/envelope/"/>
 </catalog>



Mime
View raw message