Author: dkulp
Date: Thu Sep 1 16:33:46 2011
New Revision: 1164143
URL: http://svn.apache.org/viewvc?rev=1164143&view=rev
Log:
[CXF-3686] Fix some warnings about using static methods in a non-static
context.
Patches from Robert Liguori applied
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/Server.java
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/client/Client.java
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/server/Server.java
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/Server.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/client/Client.java
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/server/Server.java
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
Thu Sep 1 16:33:46 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/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/Server.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/Server.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/Server.java
Thu Sep 1 16:33:46 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/trunk/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/client/Client.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/client/Client.java
Thu Sep 1 16:33:46 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/trunk/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/server/Server.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/server/Server.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/demo/ws_policy/server/Server.java
Thu Sep 1 16:33:46 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/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
Thu Sep 1 16:33:46 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/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
Thu Sep 1 16:33:46 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/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
Thu Sep 1 16:33:46 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/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java
Thu Sep 1 16:33:46 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/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java
Thu Sep 1 16:33:46 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;
@@ -58,7 +59,7 @@ public final class Client {
URL busFile = Client.class.getResource("wssec.xml");
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/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/Server.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/Server.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/Server.java
Thu Sep 1 16:33:46 2011
@@ -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;
public class Server {
@@ -33,7 +34,7 @@ public class Server {
SpringBusFactory bf = new SpringBusFactory();
URL busFile = Server.class.getResource("wssec.xml");
Bus bus = bf.createBus(busFile.toString());
- bf.setDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
//Object implementor = new GreeterImpl();
//String address = "https://localhost:9001/SoapContext/SoapPort";;
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
Thu Sep 1 16:33:46 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/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
Thu Sep 1 16:33:46 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/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/client/Client.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/client/Client.java
Thu Sep 1 16:33:46 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/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/server/Server.java?rev=1164143&r1=1164142&r2=1164143&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/server/Server.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/server/Server.java
Thu Sep 1 16:33:46 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";;
