Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml?rev=1078120&r1=1078119&r2=1078120&view=diff ============================================================================== --- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml (original) +++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml Fri Mar 4 20:33:44 2011 @@ -21,8 +21,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"; xmlns:jaxws="http://cxf.apache.org/jaxws"; + xmlns:cxf="http://cxf.apache.org/core"; xsi:schemaLocation=" http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd +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"> @@ -34,36 +36,28 @@ http://www.springframework.org/schema/be <!-- 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> + <cxf:bus> + <cxf:inInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="loggingIn"/> - </list> - </property> - <property name="inFaultInterceptors"> - <list> + </cxf:inInterceptors> + <cxf:inFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="loggingIn"/> - </list> - </property> - <property name="outInterceptors"> - <list> + </cxf:inFaultInterceptors> + <cxf:outInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="loggingOut"/> - </list> - </property> - <property name="outFaultInterceptors"> - <list> + </cxf:outInterceptors> + <cxf:outFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="loggingOut"/> - </list> - </property> - </bean> + </cxf:outFaultInterceptors> + </cxf:bus> <!--jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort"; createdFromAPI="true">
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml?rev=1078120&r1=1078119&r2=1078120&view=diff ============================================================================== --- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml (original) +++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml Fri Mar 4 20:33:44 2011 @@ -19,9 +19,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 +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 class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> @@ -34,31 +36,23 @@ http://www.springframework.org/schema/be <!-- 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> + <cxf:bus> + <cxf:inInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> - </list> - </property> - <property name="inFaultInterceptors"> - <list> + </cxf:inInterceptors> + <cxf:inFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> - </list> - </property> - <property name="outInterceptors"> - <list> + </cxf:inFaultInterceptors> + <cxf:outInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> - </list> - </property> - <property name="outFaultInterceptors"> - <list> + </cxf:outInterceptors> + <cxf:outFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> - </list> - </property> - </bean> + </cxf:outFaultInterceptors> + </cxf:bus> </beans> \ No newline at end of file Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml?rev=1078120&r1=1078119&r2=1078120&view=diff ============================================================================== --- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml (original) +++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml Fri Mar 4 20:33:44 2011 @@ -19,9 +19,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 +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 class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> @@ -34,31 +36,22 @@ http://www.springframework.org/schema/be <!-- 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> + <cxf:bus> + <cxf:inInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> - </list> - </property> - <property name="inFaultInterceptors"> - <list> + </cxf:inInterceptors> + <cxf:inFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> - </list> - </property> - <property name="outInterceptors"> - <list> + </cxf:inFaultInterceptors> + <cxf:outInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> - </list> - </property> - <property name="outFaultInterceptors"> - <list> + </cxf:outInterceptors> + <cxf:outFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> - </list> - </property> - </bean> - + </cxf:outFaultInterceptors> + </cxf:bus> </beans> \ No newline at end of file Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/message-loss-server.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/message-loss-server.xml?rev=1078120&r1=1078119&r2=1078120&view=diff ============================================================================== --- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/message-loss-server.xml (original) +++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/message-loss-server.xml Fri Mar 4 20:33:44 2011 @@ -21,9 +21,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"; xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"; + xmlns:cxf="http://cxf.apache.org/core"; xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"; xsi:schemaLocation=" http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd +http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> @@ -40,41 +42,33 @@ http://www.springframework.org/schema/be <!-- 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> + <cxf:bus> + <cxf:inInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalIn"/> <ref bean="rmCodec"/> - </list> - </property> - <property name="inFaultInterceptors"> - <list> + </cxf:inInterceptors> + <cxf:inFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalIn"/> <ref bean="rmCodec"/> - </list> - </property> - <property name="outInterceptors"> - <list> + </cxf:inFaultInterceptors> + <cxf:outInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalOut"/> <ref bean="rmCodec"/> <ref bean="messageLoss"/> - </list> - </property> - <property name="outFaultInterceptors"> - <list> + </cxf:outInterceptors> + <cxf:outFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalOut"/> <ref bean="rmCodec"/> - </list> - </property> - </bean> + </cxf:outFaultInterceptors> + </cxf:bus> Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml?rev=1078120&r1=1078119&r2=1078120&view=diff ============================================================================== --- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml (original) +++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml Fri Mar 4 20:33:44 2011 @@ -19,8 +19,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"; xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd +http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd +"> <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/> <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/> @@ -37,44 +40,36 @@ http://www.springframework.org/schema/be <!-- 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> + <cxf:bus> + <cxf:inInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalIn"/> <ref bean="rmCodec"/> <ref bean="rmDelivery"/> <!-- bean class="org.apache.cxf.interceptor.LoggingInInterceptor" /--> - </list> - </property> - <property name="inFaultInterceptors"> - <list> + </cxf:inInterceptors> + <cxf:inFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalIn"/> <ref bean="rmCodec"/> <ref bean="rmDelivery"/> <!--bean class="org.apache.cxf.interceptor.LoggingInInterceptor" /--> - </list> - </property> - <property name="outInterceptors"> - <list> + </cxf:inFaultInterceptors> + <cxf:outInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalOut"/> <ref bean="rmCodec"/> <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - </list> - </property> - <property name="outFaultInterceptors"> - <list> + </cxf:outInterceptors> + <cxf:outFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalOut"/> <ref bean="rmCodec"/> <!-- bean class="org.apache.cxf.interceptor.LoggingOutInterceptor" /--> - </list> - </property> - </bean> + </cxf:outFaultInterceptors> + </cxf:bus> </beans> Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors_provider.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors_provider.xml?rev=1078120&r1=1078119&r2=1078120&view=diff ============================================================================== --- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors_provider.xml (original) +++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors_provider.xml Fri Mar 4 20:33:44 2011 @@ -19,8 +19,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"; xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd +http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd +"> <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/> <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/> @@ -37,44 +40,36 @@ http://www.springframework.org/schema/be <!-- 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> + <cxf:bus> + <cxf:inInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalIn"/> <ref bean="rmCodec"/> <ref bean="rmDelivery"/> <bean class="org.apache.cxf.interceptor.LoggingInInterceptor" /> - </list> - </property> - <property name="inFaultInterceptors"> - <list> + </cxf:inInterceptors> + <cxf:inFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalIn"/> <ref bean="rmCodec"/> <ref bean="rmDelivery"/> <bean class="org.apache.cxf.interceptor.LoggingInInterceptor" /> - </list> - </property> - <property name="outInterceptors"> - <list> + </cxf:inFaultInterceptors> + <cxf:outInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalOut"/> <ref bean="rmCodec"/> <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - </list> - </property> - <property name="outFaultInterceptors"> - <list> + </cxf:outInterceptors> + <cxf:outFaultInterceptors> <ref bean="mapAggregator"/> <ref bean="mapCodec"/> <ref bean="rmLogicalOut"/> <ref bean="rmCodec"/> <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - </list> - </property> - </bean> + </cxf:outFaultInterceptors> + </cxf:bus> </beans> Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml?rev=1078120&r1=1078119&r2=1078120&view=diff ============================================================================== --- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml (original) +++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml Fri Mar 4 20:33:44 2011 @@ -22,8 +22,6 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/> - <!-- Endpoint Level Interceptors--> <!-- Inserted From JaxWsEndpointImpl, EndpointImpl--> <bean id="wrapperClassIn" class="org.apache.cxf.jaxws.interceptors.WrapperClassInInterceptor"/> Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/Bethal.cxf URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/Bethal.cxf?rev=1078120&r1=1078119&r2=1078120&view=diff ============================================================================== --- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/Bethal.cxf (original) +++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/Bethal.cxf Fri Mar 4 20:33:44 2011 @@ -29,10 +29,12 @@ xmlns:sec="http://cxf.apache.org/configuration/security"; xmlns:http="http://cxf.apache.org/transports/http/configuration"; xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; + xmlns:cxf="http://cxf.apache.org/core"; xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd + 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://cxf.apache.org/transports/http-jetty/configuration @@ -71,12 +73,10 @@ </httpj:engine> </httpj:engine-factory> - <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"> - <property name="inInterceptors"> - <list> + <cxf:bus> + <cxf:inInterceptors> <bean class="org.apache.cxf.systest.http.PushBack401"/> - </list> - </property> - </bean> + </cxf:inInterceptors> + </cxf:bus> </beans> Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/Morpit.cxf URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/Morpit.cxf?rev=1078120&r1=1078119&r2=1078120&view=diff ============================================================================== --- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/Morpit.cxf (original) +++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/Morpit.cxf Fri Mar 4 20:33:44 2011 @@ -70,6 +70,4 @@ </httpj:engine> </httpj:engine-factory> - <!-- We need a bean named "cxf", or SpringBusFactory barfs --> - <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/> </beans> Modified: cxf/trunk/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff ============================================================================== --- cxf/trunk/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml (original) +++ cxf/trunk/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml Fri Mar 4 20:33:44 2011 @@ -8,7 +8,6 @@ <import resource="classpath:META-INF/cxf/cxf.xml" /> - <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> <import resource="classpath:META-INF/cxf/cxf-servlet.xml" /> <jaxws:endpoint
