Author: andreasmyth
Date: Wed Aug 8 07:02:45 2007
New Revision: 563888
URL: http://svn.apache.org/viewvc?view=rev&rev=563888
Log:
Modified addressing demo to use feature instead of explicitly configuring
interceptor chains.
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/README.txt
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/README.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/README.txt?view=diff&rev=563888&r1=563887&r2=563888
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/README.txt
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/README.txt
Wed Aug 8 07:02:45 2007
@@ -3,8 +3,9 @@
This demo shows how WS-Addressing support in Apache CXF may be enabled.
-The client and server both use interceptor configuration to install the
-WS-Addressing interceptor, comprising a logical interceptor (MAPAggregator)
+The client and server both apply the addressing feature to the bus.
+This ensures installation of the WS-Addressing interceptors,
+comprising a logical interceptor (MAPAggregator)
responsible for aggregating the WS-A MessageAddressingProperties for
the current message, and a protocol interceptor (MAPCodec) responsible for
encoding/decoding these properties as SOAP Headers.
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=563888&r1=563887&r2=563888
==============================================================================
---
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
Wed Aug 8 07:02:45 2007
@@ -19,37 +19,22 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:cxf="http://cxf.apache.org/core";
+ xmlns:wsa="http://cxf.apache.org/ws/addressing";
xmlns:http="http://cxf.apache.org/transports/http/configuration";
- xsi:schemaLocation="http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ xsi:schemaLocation="
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
<http:conduit
name="{http://apache.org/hello_world_soap_http}SoapPort.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.CXFBusImpl">
- <property name="inInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- </list>
- </property>
- <property name="outInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- </list>
- </property>
- <property name="outFaultInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- </list>
- </property>
- </bean>
+ <cxf:bus>
+ <cxf:features>
+ <wsa:addressing/>
+ </cxf:features>
+ </cxf:bus>
+
</beans>
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=563888&r1=563887&r2=563888
==============================================================================
---
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
Wed Aug 8 07:02:45 2007
@@ -18,39 +18,17 @@
under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:cxf="http://cxf.apache.org/core";
+ xmlns:wsa="http://cxf.apache.org/ws/addressing";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.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"/>
+ <cxf:bus>
+ <cxf:features>
+ <wsa:addressing/>
+ </cxf:features>
+ </cxf:bus>
- <!-- 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.CXFBusImpl">
- <property name="inInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- </list>
- </property>
- <property name="inFaultInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- </list>
- </property>
- <property name="outInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- </list>
- </property>
- <property name="outFaultInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- </list>
- </property>
- </bean>
</beans>
