Author: dkulp
Date: Fri Feb  2 07:30:23 2007
New Revision: 502625

URL: http://svn.apache.org/viewvc?view=rev&rev=502625
Log:
Apply patch for CXF-405 from Jonathan Anstey (thanks!)


Modified:
    
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/client.xml
    
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/server.xml

Modified: 
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/client.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/client.xml?view=diff&rev=502625&r1=502624&r2=502625
==============================================================================
--- 
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/client.xml
 (original)
+++ 
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/client.xml
 Fri Feb  2 07:30:23 2007
@@ -19,24 +19,20 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans";
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration";
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+       xmlns:http="http://cxf.apache.org/transports/http/configuration";
+       xsi:schemaLocation="http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schema/transports/http.xsd
+       http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
   
-    <bean 
name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit"; 
abstract="true">     
-        <property name="client">
-            <value>
-                <http-conf:client 
DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
+    <http:conduit 
id="{http://apache.org/hello_world_soap_http}SoapPort9001.http-conduit";>
+      <http:client 
DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
+    </http:conduit>
 
     <bean id="mapAggregator" 
class="org.apache.cxf.ws.addressing.MAPAggregator"/>
     <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
 
     <!-- We are adding the interceptors to the bus as we will have only one 
endpoint/service/bus. -->
 
-    <bean id="cxf" class="org.apache.cxf.bus.spring.SpringBusImpl">
+    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
         <property name="inInterceptors">
             <list>
                 <ref bean="mapAggregator"/>

Modified: 
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/server.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/server.xml?view=diff&rev=502625&r1=502624&r2=502625
==============================================================================
--- 
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/server.xml
 (original)
+++ 
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/server.xml
 Fri Feb  2 07:30:23 2007
@@ -27,7 +27,7 @@
 
     <!-- We are adding the interceptors to the bus as we will have only one 
endpoint/service/bus. -->
 
-    <bean id="cxf" class="org.apache.cxf.bus.spring.SpringBusImpl">
+    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
         <property name="inInterceptors">
             <list>
                 <ref bean="mapAggregator"/>


Reply via email to