You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2012/09/24 09:09:25 UTC
svn commit: r1389228 - in /cxf/branches/2.5.x-fixes: ./
tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml
Author: ningjiang
Date: Mon Sep 24 07:09:24 2012
New Revision: 1389228
URL: http://svn.apache.org/viewvc?rev=1389228&view=rev
Log:
Merged revisions 1389227 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................
r1389227 | ningjiang | 2012-09-24 15:06:21 +0800 (Mon, 24 Sep 2012) | 9 lines
Merged revisions 1389225 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1389225 | ningjiang | 2012-09-24 14:59:49 +0800 (Mon, 24 Sep 2012) | 1 line
CXF-4518 added the mapping of http://www.w3.org/2006/03/addressing
........
................
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1389225
Merged /cxf/branches/2.6.x-fixes:r1389227
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml?rev=1389228&r1=1389227&r2=1389228&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml (original)
+++ cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml Mon Sep 24 07:09:24 2012
@@ -18,5 +18,6 @@
under the License.
-->
<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"/>
</catalog>