[jbossws-commits] JBossWS SVN: r16818 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/resources/META-INF and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-10-04 12:36:12 -0400 (Thu, 04 Oct 2012)
New Revision: 16818

Modified:
   stack/cxf/branches/jbossws-cxf-4.0.x/
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml
Log:
Merged revisions 16817 via svnmerge from 
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk

.......
  r16817 | alessio.soldano at jboss.com | 2012-10-04 18:31:23 +0200 (Thu, 04 Oct 2012) | 2 lines
  
  [JBWS-3554] Adding http://ws-i.org/profiles/basic/1.1 entry in jax-ws-catalog.xml
.......



Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
   - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15883,15885-15896,15900-15920,15936,15965,15967,15973,16067-16075,16077-16083,16085-16087,16091-16093,16095-16096,16098-16100,16103-16107,16111-16121,16124-16126,16128-16157,16159-16160,16162-16163,16165-16183,16204-16225,16227,16230-16234,16241,16243-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644
   + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15883,15885-15896,15900-15920,15936,15965,15967,15973,16067-16075,16077-16083,16085-16087,16091-16093,16095-16096,16098-16100,16103-16107,16111-16121,16124-16126,16128-16157,16159-16160,16162-16163,16165-16183,16204-16225,16227,16230-16234,16241,16243-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16817
Modified: svn:mergeinfo
   - /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644
   + /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16817

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml	2012-10-04 16:31:23 UTC (rev 16817)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml	2012-10-04 16:36:12 UTC (rev 16818)
@@ -19,4 +19,5 @@
 -->
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
     <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing" rewritePrefix="classpath:/schemas/wsdl"/>
+    <rewriteSystem systemIdStartString="http://ws-i.org/profiles/basic/1.1" rewritePrefix="classpath:/schemas/wsdl"/>
 </catalog>