cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1164149 - in /cxf/branches/2.4.x-fixes: ./ distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/ distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/ distribution/src/main/release/...
Date Thu, 01 Sep 2011 16:40:06 GMT
Author: dkulp
Date: Thu Sep  1 16:40:06 2011
New Revision: 1164149

URL: http://svn.apache.org/viewvc?rev=1164149&view=rev
Log:
Merged revisions 1164143 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1164143 | dkulp | 2011-09-01 12:33:46 -0400 (Thu, 01 Sep 2011) | 3 lines
  
  [CXF-3686] Fix some warnings about using static methods in a non-static
  context.
  Patches from Robert Liguori applied
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/Server.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/client/Client.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/server/Server.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/Server.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/client/Client.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/server/Server.java

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

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
Thu Sep  1 16:40:06 2011
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.ws.addressing.AddressingBuilder;
 import org.apache.cxf.ws.addressing.AddressingProperties;
@@ -70,7 +71,7 @@ public final class Client {
             SpringBusFactory bf = new SpringBusFactory();
             URL busFile = Client.class.getResource("client.xml");
             Bus bus = bf.createBus(busFile.toString());
-            bf.setDefaultBus(bus);
+            BusFactory.setDefaultBus(bus);
 
 
             SOAPService service = new SOAPService(wsdlURL, SERVICE_NAME);

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/Server.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/Server.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/Server.java
Thu Sep  1 16:40:06 2011
@@ -23,6 +23,7 @@ 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 {
@@ -33,7 +34,7 @@ public class Server {
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = Server.class.getResource("server.xml");
         Bus bus = bf.createBus(busFile.toString());
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
 
         Object implementor = new GreeterImpl();
         String address = "http://localhost:9000/SoapContext/SoapPort";

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/client/Client.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/client/Client.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/client/Client.java
Thu Sep  1 16:40:06 2011
@@ -22,6 +22,7 @@ package demo.ws_policy.client;
 import java.net.URL;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.PingMeFault;
@@ -40,7 +41,7 @@ public final class Client {
             SpringBusFactory bf = new SpringBusFactory();
             URL busFile = Client.class.getResource("client.xml");
             Bus bus = bf.createBus(busFile.toString());
-            bf.setDefaultBus(bus);
+            BusFactory.setDefaultBus(bus);
 
             SOAPService service = new SOAPService();
             Greeter port = service.getSoapPort();

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/server/Server.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/server/Server.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/server/Server.java
Thu Sep  1 16:40:06 2011
@@ -23,6 +23,7 @@ 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 {
@@ -33,7 +34,7 @@ public class Server {
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = Server.class.getResource("server.xml");
         Bus bus = bf.createBus(busFile.toString());
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
 
         Object implementor = new GreeterImpl();
         String address = "http://localhost:9000/SoapContext/SoapPort";

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
Thu Sep  1 16:40:06 2011
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 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;
@@ -48,7 +49,7 @@ public final class Client {
             SpringBusFactory bf = new SpringBusFactory();
             URL busFile = Client.class.getResource("wssec.xml");
             Bus bus = bf.createBus(busFile.toString());
-            bf.setDefaultBus(bus);
+            BusFactory.setDefaultBus(bus);
 
             Map<String, Object> outProps = new HashMap<String, Object>();
             outProps.put("action", "UsernameToken Timestamp Signature Encrypt");

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
Thu Sep  1 16:40:06 2011
@@ -27,6 +27,7 @@ import java.util.Map;
 import javax.xml.ws.Endpoint;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
@@ -89,7 +90,7 @@ public class Server {
 
         bus.getInInterceptors().add(new WSS4JInInterceptor(inProps));
 
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
 
         new Server();
         System.out.println("Server ready...");

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
Thu Sep  1 16:40:06 2011
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 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;
@@ -47,7 +48,7 @@ public final class Client {
             SpringBusFactory bf = new SpringBusFactory();
             URL busFile = Client.class.getResource("wssec.xml");
             Bus bus = bf.createBus(busFile.toString());
-            bf.setDefaultBus(bus);
+            BusFactory.setDefaultBus(bus);
 
             Map<String, Object> outProps = new HashMap<String, Object>();
             outProps.put("action", "UsernameToken Timestamp");

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java
Thu Sep  1 16:40:06 2011
@@ -27,6 +27,7 @@ import java.util.Map;
 import javax.xml.ws.Endpoint;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
@@ -66,7 +67,7 @@ public class Server {
 
         bus.getInInterceptors().add(new WSS4JInInterceptor(inProps));
 
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
 
         new Server();
         System.out.println("Server ready...");

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java
Thu Sep  1 16:40:06 2011
@@ -1,81 +1,82 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package demo.wssec.client;
-
-import java.io.File;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.hello_world_soap_http.Greeter;
-import org.apache.hello_world_soap_http.SOAPService;
-
-public final class Client {
-
-    private static final QName SERVICE_NAME
-        = new QName("http://apache.org/hello_world_soap_http", "SOAPService");
-
-    private static final QName PORT_NAME =
-        new QName("http://apache.org/hello_world_soap_http", "SoapPort");
-
-
-    private Client() {
-    }
-
-    public static void main(String args[]) throws Exception {
-
-        if (args.length == 0) {
-            System.out.println("please specify wsdl");
-            System.exit(1);
-        }
-
-        URL wsdlURL;
-        File wsdlFile = new File(args[0]);
-        if (wsdlFile.exists()) {
-            wsdlURL = wsdlFile.toURL();
-        } else {
-            wsdlURL = new URL(args[0]);
-        }
-
-        SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = Client.class.getResource("wssec.xml");
-        
-        Bus bus = bf.createBus(busFile.toString());
-        bf.setDefaultBus(bus);
-
-        System.out.println(wsdlURL);
-        SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
-        Greeter port = ss.getPort(PORT_NAME, Greeter.class);
-
-        System.out.println("Invoking greetMe...");
-        try {
-            String resp = port.greetMe(System.getProperty("user.name"));
-            System.out.println("Server responded with: " + resp);
-            System.out.println();
-
-        } catch (Exception e) {
-            System.out.println("Invocation failed with the following: " + e.getCause());
-            System.out.println();
-        }
-
-        System.exit(0);
-    }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package demo.wssec.client;
+
+import java.io.File;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.hello_world_soap_http.Greeter;
+import org.apache.hello_world_soap_http.SOAPService;
+
+public final class Client {
+
+    private static final QName SERVICE_NAME
+        = new QName("http://apache.org/hello_world_soap_http", "SOAPService");
+
+    private static final QName PORT_NAME =
+        new QName("http://apache.org/hello_world_soap_http", "SoapPort");
+
+
+    private Client() {
+    }
+
+    public static void main(String args[]) throws Exception {
+
+        if (args.length == 0) {
+            System.out.println("please specify wsdl");
+            System.exit(1);
+        }
+
+        URL wsdlURL;
+        File wsdlFile = new File(args[0]);
+        if (wsdlFile.exists()) {
+            wsdlURL = wsdlFile.toURL();
+        } else {
+            wsdlURL = new URL(args[0]);
+        }
+
+        SpringBusFactory bf = new SpringBusFactory();
+        URL busFile = Client.class.getResource("wssec.xml");
+        
+        Bus bus = bf.createBus(busFile.toString());
+        BusFactory.setDefaultBus(bus);
+
+        System.out.println(wsdlURL);
+        SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
+        Greeter port = ss.getPort(PORT_NAME, Greeter.class);
+
+        System.out.println("Invoking greetMe...");
+        try {
+            String resp = port.greetMe(System.getProperty("user.name"));
+            System.out.println("Server responded with: " + resp);
+            System.out.println();
+
+        } catch (Exception e) {
+            System.out.println("Invocation failed with the following: " + e.getCause());
+            System.out.println();
+        }
+
+        System.exit(0);
+    }
+
+}

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/Server.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/Server.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/Server.java
Thu Sep  1 16:40:06 2011
@@ -1,56 +1,57 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package demo.wssec.server;
-
-import java.net.URL;
-
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-
-public class Server {
-
-    protected Server() throws Exception {
-        System.out.println("Starting Server");
-
-        SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = Server.class.getResource("wssec.xml");
-        Bus bus = bf.createBus(busFile.toString());
-        bf.setDefaultBus(bus);
-
-        //Object implementor = new GreeterImpl();
-        //String address = "https://localhost:9001/SoapContext/SoapPort";
-        //Endpoint.publish(address, implementor);
-    }
-
-    public static void main(String args[]) throws Exception {
-        System.out.println("The server's security configuration will be taken "
-                           + "from server.xml using the bean name : "
-                           + "\"{http://apache.org/hello_world_soap_http}"
-                           + "GreeterImplPort.http-destination\".");
-        System.out.println();
-        new Server();
-        System.out.println("Server ready...");
-
-        Thread.sleep(5 * 60 * 1000);
-        System.out.println("Server exiting");
-        System.exit(0);
-    }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package demo.wssec.server;
+
+import java.net.URL;
+
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+
+public class Server {
+
+    protected Server() throws Exception {
+        System.out.println("Starting Server");
+
+        SpringBusFactory bf = new SpringBusFactory();
+        URL busFile = Server.class.getResource("wssec.xml");
+        Bus bus = bf.createBus(busFile.toString());
+        BusFactory.setDefaultBus(bus);
+
+        //Object implementor = new GreeterImpl();
+        //String address = "https://localhost:9001/SoapContext/SoapPort";
+        //Endpoint.publish(address, implementor);
+    }
+
+    public static void main(String args[]) throws Exception {
+        System.out.println("The server's security configuration will be taken "
+                           + "from server.xml using the bean name : "
+                           + "\"{http://apache.org/hello_world_soap_http}"
+                           + "GreeterImplPort.http-destination\".");
+        System.out.println();
+        new Server();
+        System.out.println("Server ready...");
+
+        Thread.sleep(5 * 60 * 1000);
+        System.out.println("Server exiting");
+        System.exit(0);
+    }
+}

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
Thu Sep  1 16:40:06 2011
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 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;
@@ -48,7 +49,7 @@ public final class Client {
             SpringBusFactory bf = new SpringBusFactory();
             URL busFile = Client.class.getResource("wssec.xml");
             Bus bus = bf.createBus(busFile.toString());
-            bf.setDefaultBus(bus);
+            BusFactory.setDefaultBus(bus);
 
             Map<String, Object> outProps = new HashMap<String, Object>();
             outProps.put("action", "UsernameToken Timestamp Signature");

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
Thu Sep  1 16:40:06 2011
@@ -27,6 +27,7 @@ import java.util.Map;
 import javax.xml.ws.Endpoint;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
@@ -81,7 +82,7 @@ public class Server {
 
         bus.getInInterceptors().add(new WSS4JInInterceptor(inProps));
 
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
 
         new Server();
         System.out.println("Server ready...");

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/client/Client.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/client/Client.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/client/Client.java
Thu Sep  1 16:40:06 2011
@@ -23,6 +23,7 @@ import java.io.File;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.SOAPService;
@@ -65,7 +66,7 @@ public final class Client {
             System.exit(1);
         }
         Bus bus = bf.createBus(busFile.toString());
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
 
         System.out.println(wsdlURL);
         SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/server/Server.java?rev=1164149&r1=1164148&r2=1164149&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/server/Server.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/server/Server.java
Thu Sep  1 16:40:06 2011
@@ -24,6 +24,7 @@ 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 +35,7 @@ public class Server {
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = Server.class.getResource("CherryServer.xml");
         Bus bus = bf.createBus(busFile.toString());
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
 
         Object implementor = new GreeterImpl();
         String address = "https://localhost:9001/SoapContext/SoapPort";



Mime
View raw message