Author: dkulp
Date: Fri Feb 17 14:53:57 2012
New Revision: 1245586
URL: http://svn.apache.org/viewvc?rev=1245586&view=rev
Log:
Merged revisions 1245364 via svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1245364 | dsosnoski | 2012-02-17 05:05:28 -0500 (Fri, 17 Feb 2012) | 1 line
Fix tests for offline build
........
Added:
cxf/branches/2.4.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd
- copied unchanged from r1245364,
cxf/branches/2.5.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml?rev=1245586&r1=1245585&r2=1245586&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml
(original)
+++
cxf/branches/2.4.x-fixes/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml
Fri Feb 17 14:53:57 2012
@@ -19,4 +19,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://ws-i.org/profiles/basic/1.1";
rewritePrefix="classpath:/schemas/wsdl"/>
</catalog>
