Return-Path: 
 <cxf-commits-return-1111-apmail-incubator-cxf-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org
Received: (qmail 63028 invoked from network); 2 Feb 2007 15:30:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 2 Feb 2007 15:30:47 -0000
Received: (qmail 60543 invoked by uid 500); 2 Feb 2007 15:30:53 -0000
Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org
Received: (qmail 60480 invoked by uid 500); 2 Feb 2007 15:30:51 -0000
Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:cxf-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cxf-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cxf-commits@incubator.apache.org>
List-Id: <cxf-commits.incubator.apache.org>
Reply-To: cxf-dev@incubator.apache.org
Delivered-To: mailing list cxf-commits@incubator.apache.org
Received: (qmail 60471 invoked by uid 99); 2 Feb 2007 15:30:51 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2007 07:30:51 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2007 07:30:44 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 65B0E1A981A; Fri,  2 Feb 2007 07:30:24 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r502625 - in
 /incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing:
 client.xml server.xml
Date: Fri, 02 Feb 2007 15:30:24 -0000
To: cxf-commits@incubator.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070202153024.65B0E1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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"/>