cxf-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1025808&view=rev
Log:
Merged revisions 1025805 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes

................
  r1025805 | ffang | 2010-10-21 09:02:46 +0800 (四, 21 10 2010) | 9 lines
  
  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.2.x-fixes/systests/uncategorized/src/test/resources/wsdl_systest/catalog.xml
      - copied unchanged from r1025805, cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/resources/wsdl_systest/catalog.xml
    cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/resources/wsdl_systest/envelope.xsd
      - copied unchanged from r1025805, cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/resources/wsdl_systest/envelope.xsd
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml
    cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/resources/META-INF/jax-ws-catalog.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml?rev=1025808&r1=1025807&r2=1025808&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml Thu Oct 21 01:28:42 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.2.x-fixes/systests/uncategorized/src/test/resources/META-INF/jax-ws-catalog.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/resources/META-INF/jax-ws-catalog.xml?rev=1025808&r1=1025807&r2=1025808&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/resources/META-INF/jax-ws-catalog.xml
(original)
+++ cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/resources/META-INF/jax-ws-catalog.xml
Thu Oct 21 01:28:42 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