Author: dkulp
Date: Fri Feb 9 11:58:43 2007
New Revision: 505468
URL: http://svn.apache.org/viewvc?view=rev&rev=505468
Log:
Patch for CXF-416 and CXF-409 from Jonathan Anstey
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/client.xml
incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/server.xml
incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/ws_rm.xml
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/client.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/client.xml?view=diff&rev=505468&r1=505467&r2=505468
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/client.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/client.xml
Fri Feb 9 11:58:43 2007
@@ -20,22 +20,19 @@
<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="GZIPStream" class="demo.stream.interceptor.StreamInterceptor"/>
<!-- 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="GZIPStream"/>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/server.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/server.xml?view=diff&rev=505468&r1=505467&r2=505468
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/server.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/server.xml
Fri Feb 9 11:58:43 2007
@@ -26,7 +26,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="GZIPStream"/>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/ws_rm.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/ws_rm.xml?view=diff&rev=505468&r1=505467&r2=505468
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/ws_rm.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/ws_rm.xml
Fri Feb 9 11:58:43 2007
@@ -19,11 +19,11 @@
-->
<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";
+ xmlns:http="http://cxf.apache.org/transports/http/configuration";
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy";
xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager";
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+ 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 id="mapAggregator"
class="org.apache.cxf.ws.addressing.MAPAggregator"/>
<bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
@@ -39,7 +39,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"/>
@@ -78,13 +78,9 @@
</property>
</bean>
- <bean
name="{http://cxf.apache.org/hello_world_soap_http}GreeterPort.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="org.apache.cxf.ws.rm.RMManager"
class="org.apache.cxf.ws.rm.RMManager">
<property name="bus" ref="cxf"/>
