Author: dkulp Date: Tue Sep 25 19:31:55 2012 New Revision: 1390085 URL: http://svn.apache.org/viewvc?rev=1390085&view=rev Log: Merged revisions 1389228 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1389228 | ningjiang | 2012-09-24 03:09:24 -0400 (Mon, 24 Sep 2012) | 16 lines 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.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml?rev=1390085&r1=1390084&r2=1390085&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml (original) +++ cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml Tue Sep 25 19:31:55 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>
