You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by an...@apache.org on 2007/06/06 02:20:07 UTC
svn commit: r544692 - in /incubator/cxf/trunk: rt/ws/rm/
rt/ws/rm/src/main/resources/ rt/ws/rm/src/main/resources/META-INF/
rt/ws/rm/src/main/resources/schemas/configuration/
rt/ws/rm/src/main/resources/schemas/wsdl/
rt/ws/rm/src/test/java/org/apache/c...
Author: andreasmyth
Date: Tue Jun 5 17:20:06 2007
New Revision: 544692
URL: http://svn.apache.org/viewvc?view=rev&rev=544692
Log:
Fixed inconsistent URI for wsrm schemas.
Made cfg files for addressing and rm system tests valid.
Added:
incubator/cxf/trunk/rt/ws/rm/src/main/resources/catalog.cat
- copied, changed from r544432, incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/catalog.cat
incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd
- copied, changed from r544432, incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/manager-types.xsd
incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
- copied, changed from r544432, incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/manager.xsd
Removed:
incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/manager-types.xsd
incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/manager.xsd
incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/catalog.cat
Modified:
incubator/cxf/trunk/rt/ws/rm/pom.xml
incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/spring.schemas
incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-policy.xjb
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/custom-rmmanager.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/atmostonce.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/deferred.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/inactivity-timeout.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/message-loss-server.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/message-loss.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/no-offer.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/oneway-client-crash.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/persistent.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/seqlength1.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/seqlength10.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/suppressed.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/terminate-on-shutdown.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml
Modified: incubator/cxf/trunk/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/pom.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/rm/pom.xml Tue Jun 5 17:20:06 2007
@@ -139,14 +139,15 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/wsrm.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/wsrm.xjb</bindingFile>
- <catalog>${basedir}/src/main/resources/schemas/wsdl/catalog.cat</catalog>
+ <catalog>${basedir}/src/main/resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/ws/addressing</deleteDir>
</deleteDirs>
</xsdOption>
<xsdOption>
- <xsd>${basedir}/src/main/resources/schemas/configuration/manager-types.xsd</xsd>
+ <xsd>${basedir}/src/main/resources/schemas/configuration/wsrm-manager-types.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/configuration/wsrm-policy.xjb</bindingFile>
+ <catalog>${basedir}/src/main/resources/catalog.cat</catalog>
<extension>true</extension>
<extensionArgs>
<extensionArg>-Xdv</extensionArg>
Modified: incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/spring.schemas?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/spring.schemas (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/spring.schemas Tue Jun 5 17:20:06 2007
@@ -1,3 +1,3 @@
-http\://cxf.apache.org/ws/rm/manager-types.xsd=schemas/configuration/manager-types.xsd
-http\://cxf.apache.org/ws/rm/manager.xsd=schemas/configuration/manager.xsd
+http\://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd=schemas/configuration/wsrm-manager-types.xsd
+http\://cxf.apache.org/schemas/configuration/wsrm-manager.xsd=schemas/configuration/wsrm-manager.xsd
http\://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd=schemas/configuration/wsrm-policy.xsd
Copied: incubator/cxf/trunk/rt/ws/rm/src/main/resources/catalog.cat (from r544432, incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/catalog.cat)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/resources/catalog.cat?view=diff&rev=544692&p1=incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/catalog.cat&r1=544432&p2=incubator/cxf/trunk/rt/ws/rm/src/main/resources/catalog.cat&r2=544692
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/catalog.cat (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/resources/catalog.cat Tue Jun 5 17:20:06 2007
@@ -19,5 +19,6 @@
--
-SYSTEM "http://schemas.xmlsoap.org/ws/2004/08/addressing" "../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/addressing.xsd"
+SYSTEM "http://schemas.xmlsoap.org/ws/2004/08/addressing" "../../../../../../common/schemas/src/main/resources/schemas/wsdl/addressing.xsd"
+SYSTEM "http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd" "schemas/configuration/wsrm-policy.xsd"
Copied: incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd (from r544432, incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/manager-types.xsd)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd?view=diff&rev=544692&p1=incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/manager-types.xsd&r1=544432&p2=incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd&r2=544692
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/manager-types.xsd (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd Tue Jun 5 17:20:06 2007
@@ -27,7 +27,7 @@
attributeFormDefault="unqualified"
jaxb:version="2.0">
- <xs:import namespace="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" schemaLocation="wsrm-policy.xsd"/>
+ <xs:import namespace="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" schemaLocation="http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd"/>
<xs:complexType name="SourcePolicyType">
<xs:annotation>
Copied: incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd (from r544432, incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/manager.xsd)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd?view=diff&rev=544692&p1=incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/manager.xsd&r1=544432&p2=incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd&r2=544692
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/manager.xsd (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd Tue Jun 5 17:20:06 2007
@@ -28,10 +28,10 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
- <xs:include schemaLocation="http://cxf.apache.org/ws/rm/manager-types.xsd"/>
- <xs:import namespace="http://www.springframework.org/schema/beans" />
- <xs:import namespace="http://cxf.apache.org/configuration/beans" />
- <xs:import namespace="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" />
+ <xs:include schemaLocation="http://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd"/>
+ <xs:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+ <xs:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+ <xs:import namespace="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" schemaLocation="http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd"/>
<xs:element name="rmManager">
<xs:complexType>
Modified: incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-policy.xjb
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-policy.xjb?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-policy.xjb (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-policy.xjb Tue Jun 5 17:20:06 2007
@@ -22,7 +22,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings schemaLocation="wsrm-policy.xsd" node="/xs:schema">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd" node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.rm.policy"/>
</jaxb:schemaBindings>
Modified: incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/custom-rmmanager.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/custom-rmmanager.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/custom-rmmanager.xml (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/custom-rmmanager.xml Tue Jun 5 17:20:06 2007
@@ -23,11 +23,14 @@
xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
+http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-http://cxf.apache.org/configuration/beans http://cxf.apache.org/schemas/configuration/cxf-beans.xsd
+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+
+ <!--
+ http://cxf.apache.org/configuration/beans http://cxf.apache.org/schemas/configuration/cxf-beans.xsd
+ -->
<import resource="rmmanager.xml"/>
<wsrm-mgr:rmManager name="{http://cxf.apache.org}ws.rm.RMManager">
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml Tue Jun 5 17:20:06 2007
@@ -21,10 +21,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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://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://apache.org/hello_world_soap_http}SoapPort.http-conduit">
+ <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.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/addressing/wsa_interceptors.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml Tue Jun 5 17:20:06 2007
@@ -22,6 +22,7 @@
xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xsi:schemaLocation="
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.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"/>
@@ -58,84 +59,11 @@
</property>
</bean>
- <jaxws:client id="{http://apache.org/hello_world_soap_http}SoapPort"
+ <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort"
createdFromAPI="true">
<jaxws:conduitSelector>
<bean class="org.apache.cxf.endpoint.DeferredConduitSelector"/>
</jaxws:conduitSelector>
</jaxws:client>
-
- <!-- Configuring the service level interceptors would work also but is not as convenient
- as we have to remember to include the default interceptors. -->
-
- <!--
- <bean id="messageSender" class="org.apache.cxf.interceptor.MessageSenderInterceptor"/>
- <bean id="outgoingChain" class="org.apache.cxf.interceptor.OutgoingChainInterceptor"/>
- <bean id="outgoingChainSetup" class="org.apache.cxf.interceptor.OutgoingChainSetupInterceptor"/>
- <bean id="serviceInvoker" class="org.apache.cxf.interceptor.ServiceInvokerInterceptor"/>
- <bean id="webFaultOut" class="org.apache.cxf.jaxws.interceptors.WebFaultOutInterceptor"/>
-
- <bean name="{http://apache.org/hello_world_soap_http}SOAPServiceAddressing" abstract="true">
- <property name="inInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- <ref bean="serviceInvoker"/>
- <ref bean="outgoingChainSetup"/>
- <ref bean="outgoingChain"/>
- </list>
- </property>
- <property name="outInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- <ref bean="messageSender"/>
- </list>
- </property>
- <property name="outFaultInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- <ref bean="messageSender"/>
- <ref bean="webFaultOut"/>
- </list>
- </property>
- </bean>
- -->
-
- <!-- Configuring the endpoint level interceptors would work also but again is not as convenient
- as we have to remember to include the default interceptors.
- Note that these include the JAX-WS handler interceptors; we have have to omit them here
- because their constructor requires a reference to the binding.
- As this test does not use JAX-WS handlers, the omission does not have any effect. -->
-
- <!--
- <bean id="wrapperClassIn" class="org.apache.cxf.jaxws.interceptors.WrapperClassInInterceptor"/>
- <bean id="wrapperClassOut" class="org.apache.cxf.jaxws.interceptors.WrapperClassOutInterceptor"/>
-
- <bean name="{http://apache.org/hello_world_soap_http}SoapPort" abstract="true">
- <property name="inInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- <ref bean="wrapperClassIn"/>
- </list>
- </property>
- <property name="outInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- <ref bean="wrapperClassOut"/>
- </list>
- </property>
- <property name="outFaultInterceptors">
- <list>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- </list>
- </property>
- </bean>
- -->
-
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/atmostonce.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/atmostonce.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/atmostonce.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/atmostonce.xml Tue Jun 5 17:20:06 2007
@@ -19,26 +19,27 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
+http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.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">
<import resource="rminterceptors.xml" />
- <wsrm-mgmt:rmManager id="org.apache.cxf.ws.rm.RMManager">
- <wsrm-mgmt:destinationPolicy>
- <wsrm-mgmt:acksPolicy intraMessageThreshold="0" />
- </wsrm-mgmt:destinationPolicy>
- <wsrm-mgmt:deliveryAssurance>
- <wsrm-mgmt:AtMostOnce />
- </wsrm-mgmt:deliveryAssurance>
- <wsrm-policy:RMAssertion>
+ <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
+ <wsrm-policy:RMAssertion>
<wsrm-policy:BaseRetransmissionInterval Milliseconds="60000" />
<wsrm-policy:AcknowledgementInterval Milliseconds="10000" />
</wsrm-policy:RMAssertion>
- </wsrm-mgmt:rmManager>
+ <wsrm-mgr:deliveryAssurance>
+ <wsrm-mgr:AtMostOnce />
+ </wsrm-mgr:deliveryAssurance>
+ <wsrm-mgr:destinationPolicy>
+ <wsrm-mgr:acksPolicy intraMessageThreshold="0" />
+ </wsrm-mgr:destinationPolicy>
+ </wsrm-mgr:rmManager>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml Tue Jun 5 17:20:06 2007
@@ -19,14 +19,12 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
- xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
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://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:9995/decoupled_endpoint"/>
</http:conduit>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml Tue Jun 5 17:20:06 2007
@@ -19,14 +19,12 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
- xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
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://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://apache.org/hello_world_soap_http}SoapPort.http-conduit">
+ <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:9995/decoupled_endpoint"/>
</http:conduit>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/deferred.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/deferred.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/deferred.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/deferred.xml Tue Jun 5 17:20:06 2007
@@ -19,22 +19,23 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
+http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.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">
<import resource="rminterceptors.xml"/>
- <wsrm-mgmt:rmManager id="org.apache.cxf.ws.rm.RMManager">
- <wsrm-mgmt:destinationPolicy>
- <wsrm-mgmt:acksPolicy intraMessageThreshold="0"/>
- </wsrm-mgmt:destinationPolicy>
- <wsrm-policy:RMAssertion>
+ <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
+ <wsrm-policy:RMAssertion>
<wsrm-policy:BaseRetransmissionInterval Milliseconds="10000"/>
<wsrm-policy:AcknowledgementInterval Milliseconds="2000"/>
</wsrm-policy:RMAssertion>
- </wsrm-mgmt:rmManager>
+ <wsrm-mgr:destinationPolicy>
+ <wsrm-mgr:acksPolicy intraMessageThreshold="0"/>
+ </wsrm-mgr:destinationPolicy>
+ </wsrm-mgr:rmManager>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/inactivity-timeout.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/inactivity-timeout.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/inactivity-timeout.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/inactivity-timeout.xml Tue Jun 5 17:20:06 2007
@@ -19,19 +19,20 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
+http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.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">
<import resource="rminterceptors.xml" />
- <wsrm-mgmt:rmManager id="org.apache.cxf.ws.rm.RMManager">
+ <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
<wsrm-policy:RMAssertion>
<wsrm-policy:InactivityTimeout Milliseconds="200" />
</wsrm-policy:RMAssertion>
- </wsrm-mgmt:rmManager>
+ </wsrm-mgr:rmManager>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/message-loss-server.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/message-loss-server.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/message-loss-server.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/message-loss-server.xml Tue Jun 5 17:20:06 2007
@@ -19,11 +19,12 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
+http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.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">
<bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
@@ -77,12 +78,12 @@
- <wsrm-mgmt:rmManager id="org.apache.cxf.ws.rm.RMManager">
+ <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
<wsrm-policy:RMAssertion>
<!-- avoid server side resends, change programatically for client -->
<wsrm-policy:BaseRetransmissionInterval Milliseconds="2000" />
</wsrm-policy:RMAssertion>
- </wsrm-mgmt:rmManager>
+ </wsrm-mgr:rmManager>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/message-loss.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/message-loss.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/message-loss.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/message-loss.xml Tue Jun 5 17:20:06 2007
@@ -19,22 +19,23 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
+http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.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">
<import resource="rminterceptors.xml" />
- <wsrm-mgmt:rmManager id="org.apache.cxf.ws.rm.RMManager">
+ <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
<wsrm-policy:RMAssertion>
<!-- avoid server side resends, change programatically for client -->
<wsrm-policy:BaseRetransmissionInterval Milliseconds="60000" />
<wsrm-policy:AcknowledgementInterval Milliseconds="2000" />
</wsrm-policy:RMAssertion>
- </wsrm-mgmt:rmManager>
+ </wsrm-mgr:rmManager>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/no-offer.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/no-offer.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/no-offer.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/no-offer.xml Tue Jun 5 17:20:06 2007
@@ -19,24 +19,24 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
+http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.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">
<import resource="rminterceptors.xml" />
- <wsrm-mgmt:rmManager id="org.apache.cxf.ws.rm.RMManager">
- <wsrm-mgmt:destinationPolicy>
- <wsrm-mgmt:acksPolicy intraMessageThreshold="0" />
- </wsrm-mgmt:destinationPolicy>
- <wsrm-mgmt:sourcePolicy includeOffer="false"/>
+ <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
<wsrm-policy:RMAssertion>
<wsrm-policy:BaseRetransmissionInterval Milliseconds="60000" />
<wsrm-policy:AcknowledgementInterval Milliseconds="60000" />
</wsrm-policy:RMAssertion>
- </wsrm-mgmt:rmManager>
+ <wsrm-mgr:sourcePolicy includeOffer="false"/>
+ <wsrm-mgr:destinationPolicy>
+ <wsrm-mgr:acksPolicy intraMessageThreshold="0" />
+ </wsrm-mgr:destinationPolicy>
+ </wsrm-mgr:rmManager>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/oneway-client-crash.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/oneway-client-crash.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/oneway-client-crash.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/oneway-client-crash.xml Tue Jun 5 17:20:06 2007
@@ -21,12 +21,9 @@
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: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://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-http://cxf.apache.org/configuration/beans http://cxf.apache.org/schemas/configuration/cxf-beans.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-2.0.xsd">
<import resource="rminterceptors.xml"/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml Tue Jun 5 17:20:06 2007
@@ -21,17 +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: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://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
+http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
http://cxf.apache.org/configuration/beans http://cxf.apache.org/schemas/configuration/cxf-beans.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
- <!--
- <import resource="message-loss-server.xml"/>
- -->
<bean class="org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore"/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/persistent.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/persistent.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/persistent.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/persistent.xml Tue Jun 5 17:20:06 2007
@@ -20,13 +20,8 @@
<beans xmlns="http://www.springframework.org/schema/beans"
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: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://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
-http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-http://cxf.apache.org/configuration/beans http://cxf.apache.org/schemas/configuration/cxf-beans.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-2.0.xsd">
<import resource="rminterceptors.xml"/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml Tue Jun 5 17:20:06 2007
@@ -19,8 +19,6 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
- xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/seqlength1.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/seqlength1.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/seqlength1.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/seqlength1.xml Tue Jun 5 17:20:06 2007
@@ -19,18 +19,17 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
- xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.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">
<import resource="rminterceptors.xml" />
- <wsrm-mgmt:rmManager id="org.apache.cxf.ws.rm.RMManager">
- <wsrm-mgmt:sourcePolicy>
- <wsrm-mgmt:sequenceTerminationPolicy maxLength="1" />
- </wsrm-mgmt:sourcePolicy>
- </wsrm-mgmt:rmManager>
+ <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
+ <wsrm-mgr:sourcePolicy>
+ <wsrm-mgr:sequenceTerminationPolicy maxLength="1" />
+ </wsrm-mgr:sourcePolicy>
+ </wsrm-mgr:rmManager>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/seqlength10.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/seqlength10.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/seqlength10.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/seqlength10.xml Tue Jun 5 17:20:06 2007
@@ -19,19 +19,18 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
- xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.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">
<import resource="rminterceptors.xml" />
- <wsrm-mgmt:rmManager id="org.apache.cxf.ws.rm.RMManager">
- <wsrm-mgmt:sourcePolicy>
- <wsrm-mgmt:sequenceTerminationPolicy maxLength="10" />
- </wsrm-mgmt:sourcePolicy>
- </wsrm-mgmt:rmManager>
+ <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
+ <wsrm-mgr:sourcePolicy>
+ <wsrm-mgr:sequenceTerminationPolicy maxLength="10" />
+ </wsrm-mgr:sourcePolicy>
+ </wsrm-mgr:rmManager>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/suppressed.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/suppressed.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/suppressed.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/suppressed.xml Tue Jun 5 17:20:06 2007
@@ -19,22 +19,23 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
+http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.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">
<import resource="rminterceptors.xml" />
- <wsrm-mgmt:rmManager id="org.apache.cxf.ws.rm.RMManager">
- <wsrm-mgmt:destinationPolicy>
- <wsrm-mgmt:acksPolicy intraMessageThreshold="0" />
- </wsrm-mgmt:destinationPolicy>
- <wsrm-policy:RMAssertion>
+ <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
+ <wsrm-policy:RMAssertion>
<wsrm-policy:BaseRetransmissionInterval Milliseconds="3000" />
<wsrm-policy:AcknowledgementInterval Milliseconds="99999999" />
</wsrm-policy:RMAssertion>
- </wsrm-mgmt:rmManager>
+ <wsrm-mgr:destinationPolicy>
+ <wsrm-mgr:acksPolicy intraMessageThreshold="0" />
+ </wsrm-mgr:destinationPolicy>
+ </wsrm-mgr:rmManager>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/terminate-on-shutdown.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/terminate-on-shutdown.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/terminate-on-shutdown.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/terminate-on-shutdown.xml Tue Jun 5 17:20:06 2007
@@ -19,25 +19,26 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
+http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.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">
<import resource="rminterceptors.xml"/>
- <wsrm-mgmt:rmManager id="org.apache.cxf.ws.rm.RMManager">
- <wsrm-mgmt:destinationPolicy>
- <wsrm-mgmt:acksPolicy intraMessageThreshold="0"/>
- </wsrm-mgmt:destinationPolicy>
- <wsrm-mgmt:sourcePolicy>
- <wsrm-mgmt:sequenceTerminationPolicy terminateOnShutdown="true"/>
- </wsrm-mgmt:sourcePolicy>
+ <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
<wsrm-policy:RMAssertion>
<wsrm-policy:BaseRetransmissionInterval Milliseconds="10000"/>
<wsrm-policy:AcknowledgementInterval Milliseconds="10000"/>
- </wsrm-policy:RMAssertion>
- </wsrm-mgmt:rmManager>
+ </wsrm-policy:RMAssertion>
+ <wsrm-mgr:sourcePolicy>
+ <wsrm-mgr:sequenceTerminationPolicy terminateOnShutdown="true"/>
+ </wsrm-mgr:sourcePolicy>
+ <wsrm-mgr:destinationPolicy>
+ <wsrm-mgr:acksPolicy intraMessageThreshold="0"/>
+ </wsrm-mgr:destinationPolicy>
+ </wsrm-mgr:rmManager>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml?view=diff&rev=544692&r1=544691&r2=544692
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml Tue Jun 5 17:20:06 2007
@@ -19,13 +19,11 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
- xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
- 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 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"/>
@@ -58,7 +56,7 @@
<bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
<!--WS-A Interceptors not required in Fault Chain-->
- <bean id="{http://cxf.apache.org/greeter_control}GreeterPort.endpoint" abstract="true">
+ <bean name="{http://cxf.apache.org/greeter_control}GreeterPort.endpoint" abstract="true">
<property name="inInterceptors">
<list>
<ref bean="rmLogicalIn"/>