cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [04/12] cxf git commit: Fix a BUNCH more warnings
Date Fri, 04 Aug 2017 16:07:27 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
index 0169852..808e10d 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
@@ -31,6 +31,7 @@ import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -68,8 +69,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
         URL busFile = ClientAuthTest.class.getResource("client-auth.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -92,8 +93,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
         URL busFile = ClientAuthTest.class.getResource("client-auth-invalid.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -121,8 +122,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
         URL busFile = ClientAuthTest.class.getResource("client-no-auth.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -150,8 +151,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
         URL busFile = ClientAuthTest.class.getResource("client-auth-chain.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -174,8 +175,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
         URL busFile = ClientAuthTest.class.getResource("client-auth-invalid2.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -203,8 +204,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
         URL busFile = ClientAuthTest.class.getResource("client-auth-invalid2.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -232,8 +233,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
         URL busFile = ClientAuthTest.class.getResource("client-auth-invalid.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
index 3777d4a..8ec9f15 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
@@ -24,6 +24,7 @@ import java.net.URL;
 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.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.hello_world.Greeter;
@@ -67,8 +68,8 @@ public class HostnameVerificationTest extends AbstractBusClientServerTestBase
{
         URL busFile = HostnameVerificationTest.class.getResource("hostname-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -96,8 +97,8 @@ public class HostnameVerificationTest extends AbstractBusClientServerTestBase
{
         URL busFile = HostnameVerificationTest.class.getResource("hostname-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -135,8 +136,8 @@ public class HostnameVerificationTest extends AbstractBusClientServerTestBase
{
         URL busFile = HostnameVerificationTest.class.getResource("hostname-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -164,8 +165,8 @@ public class HostnameVerificationTest extends AbstractBusClientServerTestBase
{
         URL busFile = HostnameVerificationTest.class.getResource("hostname-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
index cc5ba7d..447c5ea 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
@@ -34,6 +34,7 @@ import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.configuration.jsse.TLSClientParameters;
@@ -82,8 +83,8 @@ public class TrustManagerTest extends AbstractBusClientServerTestBase {
         URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -117,8 +118,8 @@ public class TrustManagerTest extends AbstractBusClientServerTestBase
{
         URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -156,8 +157,8 @@ public class TrustManagerTest extends AbstractBusClientServerTestBase
{
         URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -193,8 +194,8 @@ public class TrustManagerTest extends AbstractBusClientServerTestBase
{
         URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -235,8 +236,8 @@ public class TrustManagerTest extends AbstractBusClientServerTestBase
{
         URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL url = SOAPService.WSDL_LOCATION;
         SOAPService service = new SOAPService(url, SOAPService.SERVICE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
index b8640b3..392c9d9 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
@@ -27,6 +27,7 @@ import javax.xml.ws.BindingProvider;
 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.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
@@ -72,7 +73,7 @@ public class BusShutdownTest extends Assert {
     private void makeTwoWayCallOnNewBus(URL wsdlUrl, String address) {
         SpringBusFactory bf = new SpringBusFactory();
         Bus bus = bf.createBus();
-        SpringBusFactory.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
         Endpoint ep = createService(address);
         doWork(wsdlUrl, address);
         // this should revert the JVM to its original state pending gc

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
index 8d50e26..7c46b1e 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
@@ -391,7 +391,7 @@ public class MessageCallbackOnewayTest extends AbstractBusClientServerTestBase
{
                     } catch (InterruptedException e) { /* ignored */ }
                 }
                 try {
-                    callbacks.wait((long)delay);
+                    callbacks.wait(delay);
                 } catch (InterruptedException e) { /* ignored */ }
                 if (callbacks.size() > count) {
                     fail("Expected " + count + " callbacks, got " + callbacks.size());

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
index 2f9ecc4..685f954 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
@@ -28,12 +28,12 @@ import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.wssec.examples.common.SecurityTestUtil;
 import org.apache.cxf.systest.wssec.examples.common.TestParam;
 import org.apache.cxf.systest.wssec.examples.sts.STSServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.cxf.ws.security.trust.STSClient;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
@@ -109,8 +109,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
         URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -139,8 +139,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
         URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -173,8 +173,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
         URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -207,8 +207,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
         URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -233,8 +233,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
         URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -264,8 +264,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
         URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -294,8 +294,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
         URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -328,8 +328,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
         URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -362,8 +362,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
         URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -395,8 +395,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
         URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -420,7 +420,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
     }
 
     private static void updateSTSPort(BindingProvider p, String port) {
-        STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
+        STSClient stsClient = (STSClient)p.getRequestContext()
+                 .get(org.apache.cxf.rt.security.SecurityConstants.STS_CLIENT);
         if (stsClient != null) {
             String location = stsClient.getWsdlLocation();
             if (location.contains("8080")) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
index ed51b66..5cd5619 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.wssec.examples.common.SecurityTestUtil;
 import org.apache.cxf.systest.wssec.examples.common.TestParam;
@@ -97,8 +98,8 @@ public class SecureConversationTest extends AbstractBusClientServerTestBase
{
         URL busFile = SecureConversationTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = SecureConversationTest.class.getResource("DoubleItSecConv.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
index e98c5f5..c5da974 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.wssec.examples.common.SecurityTestUtil;
 import org.apache.cxf.systest.wssec.examples.common.TestParam;
@@ -98,8 +99,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
         URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -128,8 +129,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase
{
         URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -158,8 +159,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase
{
         URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -188,8 +189,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase
{
         URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -222,8 +223,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase
{
         URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -252,8 +253,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase
{
         URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -282,8 +283,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase
{
         URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
index 09f65f0c..22e9b61 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.wssec.examples.common.SecurityTestUtil;
 import org.apache.cxf.systest.wssec.examples.common.TestParam;
@@ -96,8 +97,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -126,8 +127,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -156,8 +157,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -186,8 +187,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/HelloService.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/HelloService.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/HelloService.java
index 59de2cf..f326f8e 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/HelloService.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/HelloService.java
@@ -37,7 +37,7 @@ public class HelloService extends Service {
 
     @WebEndpoint(name = "HelloPort")
     public Hello getHelloPort() {
-        return (Hello)super.getPort(HELLO_PORT, Hello.class);
+        return super.getPort(HELLO_PORT, Hello.class);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
index ca492f4..f7706da 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
@@ -38,7 +38,6 @@ import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.soap.Addressing;
 import javax.xml.xpath.XPathConstants;
 
-import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import org.apache.cxf.BusFactory;
@@ -107,7 +106,7 @@ public class Server extends AbstractBusTestServerBase {
             //CHECK the incoming
             Element el;
             try {
-                el = ((Document)StaxUtils.read(obj)).getDocumentElement();
+                el = StaxUtils.read(obj).getDocumentElement();
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -140,7 +139,7 @@ public class Server extends AbstractBusTestServerBase {
 
             Element el;
             try {
-                el = ((Document)StaxUtils.read(obj)).getDocumentElement();
+                el = StaxUtils.read(obj).getDocumentElement();
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
index 8a2bbe8..63639ca 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
@@ -125,7 +125,7 @@ public abstract class AbstractGreeterImpl implements Greeter {
             String property = ADDRESSING_PROPERTIES_INBOUND;
             AddressingProperties maps = (AddressingProperties)
                 context.getMessageContext().get(property);
-            verificationCache.put(MAPTest.verifyMAPs(maps, this));
+            verificationCache.put(MAPTestBase.verifyMAPs(maps, this));
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
index a8a9335..224266d 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
@@ -47,7 +47,7 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.ContextUtils;
 import org.apache.cxf.ws.addressing.Names;
-import org.apache.cxf.ws.addressing.soap.VersionTransformer;
+import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
 import org.apache.cxf.ws.addressing.v200408.AttributedURI;
 
 import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND;
@@ -135,14 +135,14 @@ public class HeaderVerifier extends AbstractSoapInterceptor {
                                  Names.WSA_NAMESPACE_NAME);
                 recordWSAHeaders(headers,
                                  wsaHeaders,
-                                 VersionTransformer.Names200408.WSA_NAMESPACE_NAME);
+                                 Names200408.WSA_NAMESPACE_NAME);
                 recordWSAHeaders(headers,
                                  wsaHeaders,
                                  MAPTestBase.CUSTOMER_NAME.getNamespaceURI());
             }
             boolean partialResponse = isIncomingPartialResponse(message)
                                       || outgoingPartialResponse;
-            verificationCache.put(MAPTest.verifyHeaders(wsaHeaders,
+            verificationCache.put(MAPTestBase.verifyHeaders(wsaHeaders,
                                                         partialResponse,
                                                         isRequestLeg(message),
                                                         false));
@@ -214,7 +214,7 @@ public class HeaderVerifier extends AbstractSoapInterceptor {
 
     private Marshaller getMarshaller() throws JAXBException {
         JAXBContext jaxbContext =
-            VersionTransformer.getExposedJAXBContext(currentNamespaceURI);
+            org.apache.cxf.ws.addressing.VersionTransformer.getExposedJAXBContext(currentNamespaceURI);
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
         return marshaller;
@@ -231,12 +231,12 @@ public class HeaderVerifier extends AbstractSoapInterceptor {
                                                    AttributedURIType.class,
                                                    value),
                 header);
-        } else if (VersionTransformer.Names200408.WSA_NAMESPACE_NAME.equals(
+        } else if (Names200408.WSA_NAMESPACE_NAME.equals(
                                                       currentNamespaceURI)) {
             AttributedURI value =
-                VersionTransformer.Names200408.WSA_OBJECT_FACTORY.createAttributedURI();
+                Names200408.WSA_OBJECT_FACTORY.createAttributedURI();
             value.setValue(from);
-            QName qname = new QName(VersionTransformer.Names200408.WSA_NAMESPACE_NAME,
+            QName qname = new QName(Names200408.WSA_NAMESPACE_NAME,
                                     Names.WSA_FROM_NAME);
             marshaller.marshal(
                 new JAXBElement<AttributedURI>(qname,

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
index bb2b326..b26a333 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
@@ -47,7 +47,7 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 import org.apache.cxf.ws.addressing.Names;
 import org.apache.cxf.ws.addressing.ReferenceParametersType;
-import org.apache.cxf.ws.addressing.soap.VersionTransformer;
+import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
 import org.apache.hello_world_soap_http.BadRecordLitFault;
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
@@ -277,8 +277,8 @@ public abstract class MAPTestBase extends AbstractClientServerTestBase
implement
         try {
             // expect two MAPs instances versioned with 200408, i.e. for both
             // the partial and full responses
-            mapVerifier.expectedExposedAs.add(VersionTransformer.Names200408.WSA_NAMESPACE_NAME);
-            mapVerifier.expectedExposedAs.add(VersionTransformer.Names200408.WSA_NAMESPACE_NAME);
+            mapVerifier.expectedExposedAs.add(Names200408.WSA_NAMESPACE_NAME);
+            mapVerifier.expectedExposedAs.add(Names200408.WSA_NAMESPACE_NAME);
             String greeting = greeter.greetMe("versioning1");
             assertEquals("unexpected response received from service",
                          "Hello versioning1",

http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
index 84fd947..e5bebe4 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
@@ -47,8 +47,8 @@ public class MAPVerifier extends AbstractPhaseInterceptor<Message>
{
     public MAPVerifier() {
         super(Phase.POST_LOGICAL);
         mapProperties = new HashMap<>();
-        mapProperties.put(MAPTest.INBOUND_KEY, ADDRESSING_PROPERTIES_INBOUND);
-        mapProperties.put(MAPTest.OUTBOUND_KEY, ADDRESSING_PROPERTIES_OUTBOUND);
+        mapProperties.put(MAPTestBase.INBOUND_KEY, ADDRESSING_PROPERTIES_INBOUND);
+        mapProperties.put(MAPTestBase.OUTBOUND_KEY, ADDRESSING_PROPERTIES_OUTBOUND);
     }
 
     public void handleMessage(Message message) {
@@ -63,8 +63,8 @@ public class MAPVerifier extends AbstractPhaseInterceptor<Message>
{
         boolean isOutbound = ContextUtils.isOutbound(message);
         String mapProperty =
             (String)mapProperties.get(isOutbound
-                                      ? MAPTest.OUTBOUND_KEY
-                                      : MAPTest.INBOUND_KEY);
+                                      ? MAPTestBase.OUTBOUND_KEY
+                                      : MAPTestBase.INBOUND_KEY);
         AddressingProperties maps =
             (AddressingProperties)message.get(mapProperty);
         if (maps == null) {
@@ -89,7 +89,7 @@ public class MAPVerifier extends AbstractPhaseInterceptor<Message>
{
                 exposeAs = null;
             }
         }
-        verificationCache.put(MAPTest.verifyMAPs(maps, this));
+        verificationCache.put(MAPTestBase.verifyMAPs(maps, this));
     }
 
     private String getExpectedExposeAs(boolean remove) {


Mime
View raw message