Author: ningjiang
Date: Sun Feb 24 19:39:49 2008
New Revision: 630726
URL: http://svn.apache.org/viewvc?rev=630726&view=rev
Log:
Merged revisions 630210 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r630210 | ningjiang | 2008-02-22 22:03:38 +0800 (Fri, 22 Feb 2008) | 1 line
Update the configuration_interceptor samples to use the cxf:bus element to
configure the bus
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml?rev=630726&r1=630725&r2=630726&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml
Sun Feb 24 19:39:49 2008
@@ -20,8 +20,11 @@
<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: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}SoapPort9001.http-conduit";>
@@ -32,22 +35,19 @@
<!-- 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="GZIPStream"/>
- </list>
- </property>
- <!--property name="outInterceptors">
- <list>
- <ref bean="GZIPStream"/>
- </list>
- </property>
- <property name="outFaultInterceptors">
- <list>
- <ref bean="GZIPStream"/>
- </list>
- </property-->
- </bean>
+ <cxf:bus>
+ <cxf:inInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:inInterceptors>
+ <cxf:inFaultInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:inFaultInterceptors>
+ <!--cxf:outInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:outInterceptors>
+ <cxf:outFaultInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:outFaultInterceptors-->
+ </cxf:bus>
</beans>
Modified:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml?rev=630726&r1=630725&r2=630726&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml
Sun Feb 24 19:39:49 2008
@@ -19,35 +19,29 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:cxf="http://cxf.apache.org/core";
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="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.CXFBusImpl">
- <!--property name="inInterceptors">
- <list>
- <ref bean="GZIPStream"/>
- </list>
- </property>
- <property name="inFaultInterceptors">
- <list>
- <ref bean="GZIPStream"/>
- </list>
- </property-->
- <property name="outInterceptors">
- <list>
- <ref bean="GZIPStream"/>
- </list>
- </property>
- <!--property name="outFaultInterceptors">
- <list>
- <ref bean="GZIPStream"/>
- </list>
- </property-->
- </bean>
+ <cxf:bus>
+ <!--cxf:inInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:inInterceptors>
+ <cxf:inFaultInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:inFaultInterceptors-->
+ <cxf:outInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:outInterceptors>
+ <!--cxf:outFaultInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:outFaultInterceptors-->
+ </cxf:bus>
<bean id="org.apache.cxf.management.InstrumentationManager"
class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
