cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreasm...@apache.org
Subject svn commit: r545177 - in /incubator/cxf/trunk/distribution/src/main/release/samples: spring_http/src/demo/spring/servlet/Server.java spring_http/webapp/WEB-INF/beans.xml streamInterceptor/client.xml ws_addressing/client.xml ws_rm/ws_rm.xml
Date Thu, 07 Jun 2007 13:41:35 GMT
Author: andreasmyth
Date: Thu Jun  7 06:41:34 2007
New Revision: 545177

URL: http://svn.apache.org/viewvc?view=rev&rev=545177
Log:
Jeff's patch for CXF-712

Modified:
    incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/src/demo/spring/servlet/Server.java
    incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/webapp/WEB-INF/beans.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/client.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/client.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/ws_rm.xml

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/src/demo/spring/servlet/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/src/demo/spring/servlet/Server.java?view=diff&rev=545177&r1=545176&r2=545177
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/src/demo/spring/servlet/Server.java
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/src/demo/spring/servlet/Server.java
Thu Jun  7 06:41:34 2007
@@ -53,12 +53,12 @@
 
         server.setHandler(handlers);
         server.start();
+        System.out.println("Server ready...");
         server.join();
     }
 
     public static void main(String args[]) throws Exception {
         new Server();
-        System.out.println("Server ready...");
     }
 
 }

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/webapp/WEB-INF/beans.xml?view=diff&rev=545177&r1=545176&r2=545177
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/webapp/WEB-INF/beans.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/webapp/WEB-INF/beans.xml
Thu Jun  7 06:41:34 2007
@@ -22,8 +22,8 @@
 	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://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.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" />
 	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
@@ -35,4 +35,4 @@
 	  address="/HelloWorld" />
 	  
 </beans>
-<!-- END SNIPPET: beans -->
\ No newline at end of file
+<!-- END SNIPPET: beans -->

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/client.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/client.xml?view=diff&rev=545177&r1=545176&r2=545177
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/client.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/client.xml
Thu Jun  7 06:41:34 2007
@@ -21,10 +21,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        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
+       xsi:schemaLocation="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}SoapPort9001.http-conduit">
+    <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort9001.http-conduit">
       <http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
     </http:conduit>
     

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=545177&r1=545176&r2=545177
==============================================================================
--- 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 Thu
Jun  7 06:41:34 2007
@@ -20,10 +20,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        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
+       xsi:schemaLocation="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}SoapPort9001.http-conduit">
+    <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort9001.http-conduit">
       <http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
     </http:conduit>
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/ws_rm.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/ws_rm.xml?view=diff&rev=545177&r1=545176&r2=545177
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/ws_rm.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/ws_rm.xml Thu Jun  7 06:41:34
2007
@@ -21,9 +21,10 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
-       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
+       xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+       xsi:schemaLocation="http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.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"/>
@@ -79,18 +80,18 @@
         </property>
     </bean>
 
-    <http:conduit id="{http://apache.org/hello_world_soap_http}SoapPort9001.http-conduit">
+    <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort9001.http-conduit">
       <http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
     </http:conduit>
 
-	<wsrm-mgmt:rmManager id="org.apache.cxf.ws.rm.RMManager">
-		<wsrm-mgmt:destinationPolicy>
-			<wsrm-mgmt:acksPolicy intraMessageThreshold="0" />
-		</wsrm-mgmt:destinationPolicy>
+	<wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
 		<wsrm-policy:RMAssertion>
 			<wsrm-policy:BaseRetransmissionInterval Milliseconds="4000"/>           
-            <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/>          
+      <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>



Mime
View raw message