Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml?view=diff&rev=544716&r1=544715&r2=544716 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml Tue Jun 5 20:22:31 2007 @@ -21,7 +21,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";> <import resource="classpath:META-INF/cxf/cxf.xml"/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml?view=diff&rev=544716&r1=544715&r2=544716 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml Tue Jun 5 20:22:31 2007 @@ -19,7 +19,7 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> <import resource="classpath:META-INF/cxf/cxf.xml"/> <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring.xml?view=diff&rev=544716&r1=544715&r2=544716 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring.xml Tue Jun 5 20:22:31 2007 @@ -21,7 +21,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";> <import resource="classpath:META-INF/cxf/cxf.xml"/> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/databinding-schema-validation.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/databinding-schema-validation.xml?view=diff&rev=544716&r1=544715&r2=544716 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/databinding-schema-validation.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/databinding-schema-validation.xml Tue Jun 5 20:22:31 2007 @@ -19,11 +19,10 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:foo="http://cxf.apache.org/configuration/foo"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean id="{http://apache.org/type_test/doc}SOAPService"; abstract="true"> + <bean name="{http://apache.org/type_test/doc}SOAPService"; abstract="true"> <property name="properties"> <map> <entry key="schema-validation-enabled" value="true" /> @@ -31,7 +30,7 @@ </property> </bean> - <bean id="{http://apache.org/type_test/xml}XMLService"; abstract="true"> + <bean name="{http://apache.org/type_test/xml}XMLService"; abstract="true"> <property name="properties"> <map> <entry key="schema-validation-enabled" value="true" /> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml?view=diff&rev=544716&r1=544715&r2=544716 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml Tue Jun 5 20:22:31 2007 @@ -21,29 +21,30 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:http="http://cxf.apache.org/transports/http/configuration"; xmlns:wsa="http://cxf.apache.org/ws/addressing"; + xmlns:wsp="http://www.w3.org/2006/07/ws-policy"; xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation=" -http://cxf.apache.org/ws/policy http://cxf.apache.org/schema/ws/policy.xsd +http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd http://cxf.apache.org/ws/addressing http://cxf.apache.org/schema/ws/addressing.xsd -http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd -http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd +http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.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 - id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";> + name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";> <http:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"; /> </http:conduit> - <jaxws:endpoint id="{http://cxf.apache.org/greeter_control}GreeterPort"; createdFromAPI="true"> + <jaxws:endpoint name="{http://cxf.apache.org/greeter_control}GreeterPort"; createdFromAPI="true"> <jaxws:features> <bean class="org.apache.cxf.feature.LoggingFeature"/> <ref bean="AddressingPolicy" /> </jaxws:features> </jaxws:endpoint> - <jaxws:client id="{http://cxf.apache.org/greeter_control}GreeterPort"; createdFromAPI="true"> + <jaxws:client name="{http://cxf.apache.org/greeter_control}GreeterPort"; createdFromAPI="true"> <jaxws:features> <bean class="org.apache.cxf.feature.LoggingFeature"/> <ref bean="AddressingPolicy" /> @@ -51,7 +52,6 @@ </jaxws:client> <wsp:Policy wsu:Id="AddressingPolicy" - xmlns:wsp="http://www.w3.org/2006/07/ws-policy"; xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata";> <wsam:Addressing> <wsp:Policy /> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml?view=diff&rev=544716&r1=544715&r2=544716 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml Tue Jun 5 20:22:31 2007 @@ -21,10 +21,10 @@ xmlns:http="http://cxf.apache.org/transports/http/configuration"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" -http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.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 id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";> + <http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";> <http:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/> </http:conduit> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml?view=diff&rev=544716&r1=544715&r2=544716 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml Tue Jun 5 20:22:31 2007 @@ -21,10 +21,10 @@ xmlns:http="http://cxf.apache.org/transports/http/configuration"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" -http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.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 id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";> + <http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";> <http:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/> </http:conduit> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml?view=diff&rev=544716&r1=544715&r2=544716 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml Tue Jun 5 20:22:31 2007 @@ -22,7 +22,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd -http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd";> +http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";> <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine"> <property name="bus" ref="cxf"/> @@ -30,12 +30,12 @@ </bean> <jaxws:endpoint - id="{http://cxf.apache.org/greeter_control}GreeterPort"; + name="{http://cxf.apache.org/greeter_control}GreeterPort"; createdFromAPI="true" wsdlLocation="org/apache/cxf/systest/ws/policy/http_server_greeter.wsdl"/> <!--<jaxws:endpoint - id="{http://cxf.apache.org/greeter_control}GreeterPort"; + name="{http://cxf.apache.org/greeter_control}GreeterPort"; abstract="true" implementor="org.apache.cxf.systest.ws.policy.GreeterImpl" address="http://localhost:9020/SoapContext/GreeterPort"; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml?view=diff&rev=544716&r1=544715&r2=544716 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml Tue Jun 5 20:22:31 2007 @@ -22,10 +22,10 @@ xmlns:http="http://cxf.apache.org/transports/http/configuration"; xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"; xsi:schemaLocation=" -http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.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 id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";> + <http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";> <http:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/> </http:conduit> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml?view=diff&rev=544716&r1=544715&r2=544716 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml Tue Jun 5 20:22:31 2007 @@ -22,10 +22,10 @@ xmlns:http="http://cxf.apache.org/transports/http/configuration"; xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"; xsi:schemaLocation=" -http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.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 id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";> + <http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";> <http:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/> </http:conduit>
