cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r898516 - in /cxf/branches/2.1.x-fixes: ./ distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/client/ distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/server/
Date Tue, 12 Jan 2010 21:07:34 GMT
Author: dkulp
Date: Tue Jan 12 21:07:34 2010
New Revision: 898516

URL: http://svn.apache.org/viewvc?rev=898516&view=rev
Log:
Merged revisions 898513 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r898513 | dkulp | 2010-01-12 15:59:55 -0500 (Tue, 12 Jan 2010) | 9 lines
  
  Merged revisions 898508 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r898508 | dkulp | 2010-01-12 15:56:24 -0500 (Tue, 12 Jan 2010) | 1 line
    
    Minor cleanup of rm sample
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/client/Client.java
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/MessageLossSimulator.java
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/server/Server.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/client/Client.java?rev=898516&r1=898515&r2=898516&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/client/Client.java
(original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/client/Client.java
Tue Jan 12 21:07:34 2010
@@ -23,6 +23,7 @@
 import java.net.URL;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.hello_world_soap_http.Greeter;
 import org.apache.cxf.hello_world_soap_http.GreeterService;
@@ -32,8 +33,6 @@
 
 public final class Client {
 
-    private static final String USER_NAME = System.getProperty("user.name");
-
     private Client() {
     }
 
@@ -43,16 +42,19 @@
             SpringBusFactory bf = new SpringBusFactory();
             URL busFile = Client.class.getResource("ws_rm.xml");
             Bus bus = bf.createBus(busFile.toString());
-            bf.setDefaultBus(bus);
+            BusFactory.setDefaultBus(bus);
 
             bus.getOutInterceptors().add(new MessageLossSimulator());
 
             GreeterService service = new GreeterService();
             Greeter port = service.getGreeterPort();
 
-            String[] names = new String[] {"Anne", "Bill", "Chris", "Daisy"};
-            // make a sequence of 4 invocations
-            for (int i = 0; i < 4; i++) {
+            String[] names = new String[] {"Anne",
+                                           "Bill",
+                                           "Chris",
+                                           "Daisy"};
+            // make a sequence of invocations
+            for (int i = 0; i < names.length; i++) {
                 System.out.println("Invoking greetMeOneWay...");
                 port.greetMeOneWay(names[i]);
                 System.out.println("No response as method is OneWay\n");

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java?rev=898516&r1=898515&r2=898516&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java
(original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java
Tue Jan 12 21:07:34 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package demos.ws_rm.common;
+package demo.ws_rm.common;
 
 import java.util.logging.LogRecord;
 import java.util.logging.SimpleFormatter;

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/MessageLossSimulator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/MessageLossSimulator.java?rev=898516&r1=898515&r2=898516&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/MessageLossSimulator.java
(original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/MessageLossSimulator.java
Tue Jan 12 21:07:34 2010
@@ -68,6 +68,7 @@
             return;
         }
         
+        
         // discard even-numbered message
         InterceptorChain chain = message.getInterceptorChain();
         ListIterator it = chain.getIterator();
@@ -75,7 +76,7 @@
             PhaseInterceptor pi = (PhaseInterceptor)it.next();
             if (MessageSenderInterceptor.class.getName().equals(pi.getId())) {
                 chain.remove(pi);
-                LOG.fine("Removed MessageSenderInterceptor from interceptor chain.");
+                LOG.info("Removed MessageSenderInterceptor from interceptor chain.");
                 break;
             }
         }

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/server/Server.java?rev=898516&r1=898515&r2=898516&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/server/Server.java
(original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/server/Server.java
Tue Jan 12 21:07:34 2010
@@ -22,8 +22,8 @@
 import java.net.URL;
 import javax.xml.ws.Endpoint;
 
-
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 
 public class Server {
@@ -34,7 +34,7 @@
 
         Object implementor = new GreeterImpl();
         String address = "http://localhost:9000/SoapContext/GreeterPort";
-        Endpoint e = Endpoint.publish(address, implementor);
+        Endpoint.publish(address, implementor);
     }
 
     public static void main(String args[]) throws Exception {
@@ -42,7 +42,8 @@
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = Server.class.getResource("ws_rm.xml");
         Bus bus = bf.createBus(busFile.toString());
-        bf.setDefaultBus(bus);
+        
+        BusFactory.setDefaultBus(bus);
 
         new Server();
         System.out.println("Server ready...");



Mime
View raw message