Return-Path: 
 <commits-return-12630-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 61121 invoked from network); 21 Oct 2010 01:29:42 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 21 Oct 2010 01:29:42 -0000
Received: (qmail 20555 invoked by uid 500); 21 Oct 2010 01:29:42 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 20452 invoked by uid 500); 21 Oct 2010 01:29:42 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 20445 invoked by uid 99); 21 Oct 2010 01:29:42 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Oct 2010 01:29:42 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Oct 2010 01:29:39 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8E55E23889F1; Thu, 21 Oct 2010 01:28:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
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 -0000
To: commits@cxf.apache.org
From: ffang@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101021012842.8E55E23889F1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>