You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/08/04 19:35:01 UTC
[01/12] cxf git commit: Update to 3.2.0-SNAPSHOT version of
xjc-plugin and dv stuff
Repository: cxf
Updated Branches:
refs/heads/master 4a663dbab -> a3cd2a98a
Update to 3.2.0-SNAPSHOT version of xjc-plugin and dv stuff
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aaa00d17
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aaa00d17
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aaa00d17
Branch: refs/heads/master
Commit: aaa00d17fa3b1056c98f0002a1e27d23fe9685fc
Parents: 4a663db
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 14:01:03 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 14:02:06 2017 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
rt/bindings/corba/pom.xml | 6 ++++++
rt/databinding/jaxb/pom.xml | 6 ++++++
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa00d17/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5c482a2..09363e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<properties>
<cxf.compiler.fork>false</cxf.compiler.fork>
<cxf.build-utils.version>3.2.2-SNAPSHOT</cxf.build-utils.version>
- <cxf.xjc-utils.version>3.1.0</cxf.xjc-utils.version>
+ <cxf.xjc-utils.version>3.2.0-SNAPSHOT</cxf.xjc-utils.version>
<cxf.jdk.version>1.8</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa00d17/rt/bindings/corba/pom.xml
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml
index c764628..2e4c8c1 100644
--- a/rt/bindings/corba/pom.xml
+++ b/rt/bindings/corba/pom.xml
@@ -99,8 +99,14 @@
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
+ <extensionArgs>
+ <extensionArg>-Xdv:attributes</extensionArg>
+ </extensionArgs>
</xsdOption>
</xsdOptions>
+ <extensions>
+ <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
+ </extensions>
</configuration>
<goals>
<goal>xsdtojava</goal>
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa00d17/rt/databinding/jaxb/pom.xml
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml
index 5359f52..f8f552d 100644
--- a/rt/databinding/jaxb/pom.xml
+++ b/rt/databinding/jaxb/pom.xml
@@ -54,6 +54,9 @@
<xsdOptions>
<xsdOption>
<xsd>${basedir}/src/test/resources/wsdl/jaxb/misc_test.xsd</xsd>
+ <extensionArgs>
+ <extensionArg>-Xdv:attributes</extensionArg>
+ </extensionArgs>
</xsdOption>
<xsdOption>
<xsd>${basedir}/src/test/resources/wsdl/jaxb/form_test.xsd</xsd>
@@ -68,6 +71,9 @@
<xsd>${basedir}/src/test/resources/wsdl/jaxb/rpc_lit.xsd</xsd>
</xsdOption>
</xsdOptions>
+ <extensions>
+ <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
+ </extensions>
</configuration>
<goals>
<goal>xsdtojava-tests</goal>
[03/12] cxf git commit: Remove bunch of unnecessary casts and change
a bunch of calls to static methods to use the appropriate static class
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
index e577738..8855519 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
@@ -25,6 +25,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.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
@@ -70,8 +71,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -92,8 +93,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -129,8 +130,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -168,8 +169,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -190,8 +191,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -226,8 +227,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -251,8 +252,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -275,8 +276,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -299,8 +300,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -327,8 +328,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -355,8 +356,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -383,8 +384,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
URL busFile = ActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
index 3d7f424..f190de4 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
@@ -30,6 +30,7 @@ import javax.xml.ws.Dispatch;
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.endpoint.Client;
import org.apache.cxf.jaxws.DispatchImpl;
@@ -97,8 +98,8 @@ public class SignatureWhitespaceTest extends AbstractBusClientServerTestBase {
URL busFile = SignatureWhitespaceTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SignatureWhitespaceTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -120,8 +121,8 @@ public class SignatureWhitespaceTest extends AbstractBusClientServerTestBase {
URL busFile = SignatureWhitespaceTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SignatureWhitespaceTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -161,8 +162,8 @@ public class SignatureWhitespaceTest extends AbstractBusClientServerTestBase {
URL busFile = SignatureWhitespaceTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SignatureWhitespaceTest.class.getResource("DoubleItAction.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
index 2d99d88..646f364 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
@@ -25,6 +25,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.ws.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -67,8 +68,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
URL busFile = AlgorithmSuiteTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -148,8 +149,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
URL busFile = AlgorithmSuiteTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -177,8 +178,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
URL busFile = AlgorithmSuiteTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -227,8 +228,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
URL busFile = AlgorithmSuiteTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -265,8 +266,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
URL busFile = AlgorithmSuiteTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -321,8 +322,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
URL busFile = AlgorithmSuiteTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
index 3a5335f..817bc04 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
@@ -25,6 +25,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.ws.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -67,8 +68,8 @@ public class StaxAlgorithmSuiteTest extends AbstractBusClientServerTestBase {
URL busFile = StaxAlgorithmSuiteTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = StaxAlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java
index 22850fb..f0cfe38 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java
@@ -25,6 +25,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.ws.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -65,8 +66,8 @@ public class BasicAuthTest extends AbstractBusClientServerTestBase {
URL busFile = BasicAuthTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BasicAuthTest.class.getResource("DoubleItBasicAuth.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -88,8 +89,8 @@ public class BasicAuthTest extends AbstractBusClientServerTestBase {
URL busFile = BasicAuthTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BasicAuthTest.class.getResource("DoubleItBasicAuth.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
index 6ed720c..83f574d 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.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.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
@@ -93,8 +94,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
URL busFile = BindingPropertiesTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -138,8 +139,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
URL busFile = BindingPropertiesTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -184,8 +185,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
URL busFile = BindingPropertiesTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -230,8 +231,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
URL busFile = BindingPropertiesTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -276,8 +277,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
URL busFile = BindingPropertiesTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -323,8 +324,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
URL busFile = BindingPropertiesTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -374,8 +375,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
URL busFile = BindingPropertiesTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -425,8 +426,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
URL busFile = BindingPropertiesTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -476,8 +477,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
URL busFile = BindingPropertiesTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -528,8 +529,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
URL busFile = BindingPropertiesTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -572,8 +573,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
URL busFile = BindingPropertiesTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
index e77b85c..d4ad6e1 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
@@ -28,6 +28,7 @@ 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.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
@@ -88,8 +89,8 @@ public class CachingTest extends AbstractBusClientServerTestBase {
URL busFile = CachingTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CachingTest.class.getResource("DoubleItCache.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -152,8 +153,8 @@ public class CachingTest extends AbstractBusClientServerTestBase {
URL busFile = CachingTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CachingTest.class.getResource("DoubleItCache.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
index dd138fa..5fbc699 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
@@ -29,6 +29,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.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
@@ -102,8 +103,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -147,8 +148,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -195,8 +196,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -244,8 +245,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -289,8 +290,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -337,8 +338,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -390,8 +391,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -437,8 +438,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -490,8 +491,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -566,8 +567,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -617,8 +618,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -653,8 +654,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -690,8 +691,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -739,8 +740,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
index 7fc8353..9265290 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
@@ -76,8 +76,8 @@ public class FaultTest extends AbstractBusClientServerTestBase {
URL busFile = FaultTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = FaultTest.class.getResource("DoubleItFault.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -109,8 +109,8 @@ public class FaultTest extends AbstractBusClientServerTestBase {
URL busFile = FaultTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = FaultTest.class.getResource("DoubleItFault.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -142,8 +142,8 @@ public class FaultTest extends AbstractBusClientServerTestBase {
URL busFile = FaultTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = FaultTest.class.getResource("DoubleItFault.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -232,8 +232,8 @@ public class FaultTest extends AbstractBusClientServerTestBase {
URL busFile = FaultTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = FaultTest.class.getResource("DoubleItFault.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -268,8 +268,8 @@ public class FaultTest extends AbstractBusClientServerTestBase {
URL busFile = FaultTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = FaultTest.class.getResource("DoubleItFault.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
index 2e6e257..6423e8a 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
@@ -31,6 +31,7 @@ import javax.xml.ws.soap.SOAPFaultException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
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;
@@ -84,8 +85,8 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase {
URL busFile = ModifiedRequestTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ModifiedRequestTest.class.getResource("DoubleItFault.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -126,8 +127,8 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase {
URL busFile = ModifiedRequestTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ModifiedRequestTest.class.getResource("DoubleItFault.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -168,8 +169,8 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase {
URL busFile = ModifiedRequestTest.class.getResource("client-untrusted.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ModifiedRequestTest.class.getResource("DoubleItFault.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -201,8 +202,8 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase {
URL busFile = ModifiedRequestTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ModifiedRequestTest.class.getResource("DoubleItFault.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -243,8 +244,8 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase {
URL busFile = ModifiedRequestTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ModifiedRequestTest.class.getResource("DoubleItFault.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
index 4ffb032..caeff69 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.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.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
@@ -120,8 +121,8 @@ public class GCMTest extends AbstractBusClientServerTestBase {
URL busFile = GCMTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = GCMTest.class.getResource("DoubleItGCM.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -162,8 +163,8 @@ public class GCMTest extends AbstractBusClientServerTestBase {
URL busFile = GCMTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = GCMTest.class.getResource("DoubleItGCM.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -205,8 +206,8 @@ public class GCMTest extends AbstractBusClientServerTestBase {
URL busFile = GCMTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = GCMTest.class.getResource("DoubleItGCM.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -247,8 +248,8 @@ public class GCMTest extends AbstractBusClientServerTestBase {
URL busFile = GCMTest.class.getResource("mgf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = GCMTest.class.getResource("DoubleItGCM.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -295,8 +296,8 @@ public class GCMTest extends AbstractBusClientServerTestBase {
URL busFile = GCMTest.class.getResource("mgf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = GCMTest.class.getResource("DoubleItGCM.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java
index 8417820..e1a9d04 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java
@@ -30,6 +30,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.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.xml.XMLSource;
@@ -76,8 +77,8 @@ public class HTTPGetTest extends AbstractBusClientServerTestBase {
URL busFile = HTTPGetTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = HTTPGetTest.class.getResource("DoubleItHTTPGet.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -101,8 +102,8 @@ public class HTTPGetTest extends AbstractBusClientServerTestBase {
URL busFile = HTTPGetTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "http://localhost:" + PORT + "/DoubleItX509KeyIdentifier/DoubleIt";
WebClient client = WebClient.create(address);
@@ -128,8 +129,8 @@ public class HTTPGetTest extends AbstractBusClientServerTestBase {
URL busFile = HTTPGetTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = HTTPGetTest.class.getResource("DoubleItHTTPGet.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -167,8 +168,8 @@ public class HTTPGetTest extends AbstractBusClientServerTestBase {
URL busFile = HTTPGetTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "http://localhost:" + PORT + "/DoubleItSignBody/DoubleIt";
WebClient client = WebClient.create(address);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
index e1a854a..93b7ca8 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.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.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
@@ -92,8 +93,8 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
URL busFile = HttpsTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = HttpsTokenTest.class.getResource("DoubleItHttps.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -138,8 +139,8 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
URL busFile = HttpsTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = HttpsTokenTest.class.getResource("DoubleItHttps.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -182,8 +183,8 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
URL busFile = HttpsTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = HttpsTokenTest.class.getResource("DoubleItHttps.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -228,8 +229,8 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
URL busFile = HttpsTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = HttpsTokenTest.class.getResource("DoubleItHttps.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java
index 455985e..9bd4077 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java
@@ -29,6 +29,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.ws.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -70,8 +71,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase {
URL busFile = MTOMSecurityTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -97,8 +98,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase {
URL busFile = MTOMSecurityTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -125,8 +126,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase {
URL busFile = MTOMSecurityTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -149,8 +150,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase {
URL busFile = MTOMSecurityTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -173,8 +174,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase {
URL busFile = MTOMSecurityTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -199,8 +200,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase {
URL busFile = MTOMSecurityTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -225,8 +226,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase {
URL busFile = MTOMSecurityTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -251,8 +252,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase {
URL busFile = MTOMSecurityTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
index 90838ab..8d0a4385 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
@@ -28,6 +28,7 @@ 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.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
@@ -96,8 +97,8 @@ public class PartsTest extends AbstractBusClientServerTestBase {
URL busFile = PartsTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -131,8 +132,8 @@ public class PartsTest extends AbstractBusClientServerTestBase {
URL busFile = PartsTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -176,8 +177,8 @@ public class PartsTest extends AbstractBusClientServerTestBase {
URL busFile = PartsTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -222,8 +223,8 @@ public class PartsTest extends AbstractBusClientServerTestBase {
URL busFile = PartsTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -286,8 +287,8 @@ public class PartsTest extends AbstractBusClientServerTestBase {
URL busFile = PartsTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -332,8 +333,8 @@ public class PartsTest extends AbstractBusClientServerTestBase {
URL busFile = PartsTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -396,8 +397,8 @@ public class PartsTest extends AbstractBusClientServerTestBase {
URL busFile = PartsTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -446,8 +447,8 @@ public class PartsTest extends AbstractBusClientServerTestBase {
URL busFile = PartsTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -492,8 +493,8 @@ public class PartsTest extends AbstractBusClientServerTestBase {
URL busFile = PartsTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -538,8 +539,8 @@ public class PartsTest extends AbstractBusClientServerTestBase {
URL busFile = PartsTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -587,8 +588,8 @@ public class PartsTest extends AbstractBusClientServerTestBase {
URL busFile = PartsTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
index f0e2db3..a41dc8e 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.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.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
@@ -89,8 +90,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase {
URL busFile = PolicyAlternativeTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -119,8 +120,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase {
URL busFile = PolicyAlternativeTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -154,8 +155,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase {
URL busFile = PolicyAlternativeTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -185,8 +186,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase {
URL busFile = PolicyAlternativeTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -223,8 +224,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase {
URL busFile = PolicyAlternativeTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -260,8 +261,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase {
URL busFile = PolicyAlternativeTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java
index 3c11d58..1a2aa96 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java
@@ -36,7 +36,7 @@ public class UriDomainFactoryBeanListener implements FactoryBeanListener {
ExtensionManagerImpl orig = (ExtensionManagerImpl)factory.getBus().getExtension(ExtensionManager.class);
List<String> names = new ArrayList<>();
names.add(org.apache.cxf.ws.policy.attachment.external.URIDomainExpressionBuilder.class.getName());
- ((ExtensionManagerImpl)orig).removeBeansOfNames(names);
+ orig.removeBeansOfNames(names);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
index 614b1da..a5e732b 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
@@ -31,6 +31,7 @@ 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.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
@@ -112,8 +113,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);
@@ -182,8 +183,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);
@@ -221,8 +222,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);
@@ -270,8 +271,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);
@@ -312,8 +313,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);
@@ -366,8 +367,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);
@@ -403,8 +404,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);
@@ -469,8 +470,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);
@@ -504,8 +505,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);
@@ -539,8 +540,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);
@@ -572,8 +573,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);
@@ -607,8 +608,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);
@@ -645,8 +646,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);
@@ -684,8 +685,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);
@@ -722,8 +723,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);
@@ -753,8 +754,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);
@@ -788,8 +789,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);
@@ -821,8 +822,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);
@@ -859,8 +860,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);
@@ -899,8 +900,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);
@@ -947,8 +948,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);
@@ -1012,8 +1013,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);
@@ -1067,8 +1068,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);
@@ -1106,8 +1107,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);
@@ -1171,8 +1172,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);
[08/12] cxf git commit: Fix unecessary "else" clauses in rt/frontend
Posted by dk...@apache.org.
Fix unecessary "else" clauses in rt/frontend
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/903ef61f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/903ef61f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/903ef61f
Branch: refs/heads/master
Commit: 903ef61fef424a6edfe2727a455139de6be45dd8
Parents: 31e5364
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 14:31:27 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 14:31:27 2017 -0400
----------------------------------------------------------------------
.../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 43 +++----
.../apache/cxf/jaxrs/impl/UriBuilderImpl.java | 3 +-
.../org/apache/cxf/jaxrs/impl/UriInfoImpl.java | 3 +-
.../jaxrs/interceptor/JAXRSInInterceptor.java | 3 +-
.../jaxrs/interceptor/JAXRSOutInterceptor.java | 6 +-
.../cxf/jaxrs/model/AbstractResourceInfo.java | 9 +-
.../apache/cxf/jaxrs/model/ApplicationInfo.java | 7 +-
.../cxf/jaxrs/model/ClassResourceInfo.java | 12 +-
.../cxf/jaxrs/model/OperationResourceInfo.java | 7 +-
.../org/apache/cxf/jaxrs/model/Parameter.java | 3 +-
.../org/apache/cxf/jaxrs/model/URITemplate.java | 12 +-
.../cxf/jaxrs/model/doc/JavaDocProvider.java | 12 +-
.../provider/AbstractConfigurableProvider.java | 3 +-
.../jaxrs/provider/AbstractJAXBProvider.java | 30 +++--
.../cxf/jaxrs/provider/BinaryDataProvider.java | 3 +-
.../provider/CachingMessageBodyReader.java | 3 +-
.../provider/CachingMessageBodyWriter.java | 3 +-
.../provider/JAXBAttachmentMarshaller.java | 6 +-
.../cxf/jaxrs/provider/JAXBElementProvider.java | 12 +-
.../cxf/jaxrs/provider/MultipartProvider.java | 31 +++--
.../cxf/jaxrs/provider/ProviderFactory.java | 12 +-
.../provider/RequestDispatcherProvider.java | 6 +-
.../jaxrs/provider/ServerProviderFactory.java | 6 +-
.../cxf/jaxrs/provider/SourceProvider.java | 9 +-
.../cxf/jaxrs/provider/XSLTJaxbProvider.java | 11 +-
.../security/JAASAuthenticationFilter.java | 35 +++---
.../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 9 +-
.../AbstractSpringComponentScanServer.java | 3 +-
.../AbstractSpringConfigurationFactory.java | 3 +-
.../cxf/jaxrs/spring/SpringResourceFactory.java | 17 ++-
.../org/apache/cxf/jaxrs/utils/HttpUtils.java | 26 ++---
.../apache/cxf/jaxrs/utils/InjectionUtils.java | 39 +++----
.../org/apache/cxf/jaxrs/utils/JAXBUtils.java | 3 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 103 ++++++++---------
.../apache/cxf/jaxrs/utils/ResourceUtils.java | 11 +-
.../apache/cxf/jaxrs/utils/SpecExceptions.java | 3 +-
.../jaxrs/utils/multipart/AttachmentUtils.java | 3 +-
.../validation/ValidationExceptionMapper.java | 3 +-
.../cxf/jaxrs/validation/ValidationUtils.java | 3 +-
.../cxf/jaxrs/CustomerParameterHandler.java | 3 +-
.../apache/cxf/jaxrs/impl/ResponseImplTest.java | 3 +-
.../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 8 +-
.../java/org/apache/cxf/jaxws/EndpointImpl.java | 7 +-
.../jaxws/context/WebServiceContextImpl.java | 5 +-
.../jaxws/context/WrappedMessageContext.java | 3 +-
.../org/apache/cxf/jaxws/spi/ProviderImpl.java | 17 +--
.../cxf/jaxws/support/JaxWsImplementorInfo.java | 25 ++--
.../support/JaxWsServiceConfiguration.java | 115 +++++++++----------
.../http_jaxws_spi/JAXWSHttpSpiDestination.java | 3 +-
.../java/org/apache/cxf/js/rhino/ServerApp.java | 3 +-
.../endpoint/dynamic/DynamicClientFactory.java | 6 +-
.../org/apache/cxf/frontend/ClientProxy.java | 3 +-
.../apache/cxf/frontend/ServerFactoryBean.java | 3 +-
.../org/apache/cxf/frontend/WSDLGetUtils.java | 9 +-
54 files changed, 305 insertions(+), 424 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index 3f8c541..ceaeb5c 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -195,14 +195,13 @@ public final class ResponseImpl extends Response {
List<Object> cookieValues = metadata.get(HttpHeaders.SET_COOKIE);
if (cookieValues == null) {
return Collections.emptyMap();
- } else {
- Map<String, NewCookie> cookies = new HashMap<>();
- for (Object o : cookieValues) {
- NewCookie newCookie = NewCookie.valueOf(o.toString());
- cookies.put(newCookie.getName(), newCookie);
- }
- return cookies;
}
+ Map<String, NewCookie> cookies = new HashMap<>();
+ for (Object o : cookieValues) {
+ NewCookie newCookie = NewCookie.valueOf(o.toString());
+ cookies.put(newCookie.getName(), newCookie);
+ }
+ return cookies;
}
public Date getDate() {
@@ -284,18 +283,17 @@ public final class ResponseImpl extends Response {
List<Object> linkValues = metadata.get(HttpHeaders.LINK);
if (linkValues == null) {
return Collections.emptySet();
- } else {
- Set<Link> links = new LinkedHashSet<Link>();
- for (Object o : linkValues) {
- Link link = o instanceof Link ? (Link)o : Link.valueOf(o.toString());
- if (!link.getUri().isAbsolute()) {
- URI requestURI = URI.create((String)outMessage.get(Message.REQUEST_URI));
- link = Link.fromLink(link).baseUri(requestURI).build();
- }
- links.add(link);
+ }
+ Set<Link> links = new LinkedHashSet<Link>();
+ for (Object o : linkValues) {
+ Link link = o instanceof Link ? (Link)o : Link.valueOf(o.toString());
+ if (!link.getUri().isAbsolute()) {
+ URI requestURI = URI.create((String)outMessage.get(Message.REQUEST_URI));
+ link = Link.fromLink(link).baseUri(requestURI).build();
}
- return links;
+ links.add(link);
}
+ return links;
}
public <T> T readEntity(Class<T> cls) throws ProcessingException, IllegalStateException {
@@ -403,9 +401,8 @@ public final class ResponseImpl extends Response {
} catch (Exception ex) {
throw new ProcessingException(ex);
}
- } else {
- return null;
}
+ return null;
}
private boolean entityStreamAvailable() {
@@ -413,9 +410,8 @@ public final class ResponseImpl extends Response {
Message inMessage = getResponseMessage();
return inMessage != null && (inMessage.getContent(XMLStreamReader.class) != null
|| inMessage.getContent(Reader.class) != null);
- } else {
- return entity instanceof InputStream;
}
+ return entity instanceof InputStream;
}
private Message getResponseMessage() {
@@ -484,10 +480,9 @@ public final class ResponseImpl extends Response {
public String getReasonPhrase() {
if (reasonPhrase != null) {
return reasonPhrase;
- } else {
- Response.Status statusEnum = Response.Status.fromStatusCode(statusCode);
- return statusEnum != null ? statusEnum.getReasonPhrase() : "";
}
+ Response.Status statusEnum = Response.Status.fromStatusCode(statusCode);
+ return statusEnum != null ? statusEnum.getReasonPhrase() : "";
}
public int getStatusCode() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
index 766dc8a..231011c 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
@@ -892,9 +892,8 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
} catch (Exception ex) {
if (new URITemplate(uriTemplate).getVariables().isEmpty()) {
throw new IllegalArgumentException(ex);
- } else {
- return uriAsTemplate(uriTemplate);
}
+ return uriAsTemplate(uriTemplate);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
index 97728f1..8a7dd6e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
@@ -96,9 +96,8 @@ public class UriInfoImpl implements UriInfo {
String value = doGetPath(decode, true);
if (value.length() > 1 && value.startsWith("/")) {
return value.substring(1);
- } else {
- return value;
}
+ return value;
}
public List<PathSegment> getPathSegments() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
index e88abb4..4474456 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
@@ -182,9 +182,8 @@ public class JAXRSInInterceptor extends AbstractPhaseInterceptor<Message> {
Response response = JAXRSUtils.createResponse(resources, null, null, 200, true);
exchange.put(Response.class, response);
return;
- } else {
- throw ex;
}
+ throw ex;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
index 8aaf82f..2c3db9e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
@@ -312,9 +312,8 @@ public class JAXRSOutInterceptor extends AbstractOutDatabindingInterceptor {
private int getActualStatus(int status, Object responseObj) {
if (status == -1) {
return responseObj == null ? 204 : 200;
- } else {
- return status;
}
+ return status;
}
private boolean checkBufferingMode(Message m, List<WriterInterceptor> writers, boolean firstTry) {
@@ -394,9 +393,8 @@ public class JAXRSOutInterceptor extends AbstractOutDatabindingInterceptor {
if (excResponse == null) {
setResponseStatus(message, 500);
throw new Fault(ex);
- } else {
- serializeMessage(pf, message, excResponse, null, false);
}
+ serializeMessage(pf, message, excResponse, null, false);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
index 9284122..f692882 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
@@ -149,9 +149,8 @@ public abstract class AbstractResourceInfo {
}
}
return (ThreadLocalProxy<?>)proxy;
- } else {
- return InjectionUtils.createThreadLocalProxy(f.getType());
}
+ return InjectionUtils.createThreadLocalProxy(f.getType());
}
private static ThreadLocalProxy<?> getMethodThreadLocalProxy(Method m, Object provider) {
@@ -171,9 +170,8 @@ public abstract class AbstractResourceInfo {
}
}
return (ThreadLocalProxy<?>)proxy;
- } else {
- return InjectionUtils.createThreadLocalProxy(m.getParameterTypes()[0]);
}
+ return InjectionUtils.createThreadLocalProxy(m.getParameterTypes()[0]);
}
@SuppressWarnings("unchecked")
@@ -194,9 +192,8 @@ public abstract class AbstractResourceInfo {
public Map<Class<?>, ThreadLocalProxy<?>> getConstructorProxies() {
if (constructorProxiesAvailable) {
return getConstructorProxyMap(false).get(serviceClass);
- } else {
- return null;
}
+ return null;
}
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ApplicationInfo.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ApplicationInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ApplicationInfo.java
index 0aa4f7b..f99a11f 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ApplicationInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ApplicationInfo.java
@@ -42,11 +42,10 @@ public class ApplicationInfo extends ProviderInfo<Application> {
Map<String, Object> appProps = super.getProvider().getProperties();
if (overridingProps.isEmpty()) {
return appProps;
- } else {
- Map<String, Object> props = new HashMap<>(appProps);
- props.putAll(overridingProps);
- return props;
}
+ Map<String, Object> props = new HashMap<>(appProps);
+ props.putAll(overridingProps);
+ return props;
}
public void setOverridingProps(Map<String, Object> overridingProps) {
this.overridingProps = overridingProps;
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
index cfda684..8b6ffad 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
@@ -198,9 +198,8 @@ public class ClassResourceInfo extends BeanResourceInfo {
public Set<String> getNameBindings() {
if (parent == null) {
return nameBindings;
- } else {
- return parent.getNameBindings();
}
+ return parent.getNameBindings();
}
public void setNameBindings(Set<String> names) {
@@ -260,9 +259,8 @@ public class ClassResourceInfo extends BeanResourceInfo {
Produces produces = AnnotationUtils.getClassAnnotation(getServiceClass(), Produces.class);
if (produces != null || parent == null) {
return JAXRSUtils.getProduceTypes(produces);
- } else {
- return parent.getProduceMime();
}
+ return parent.getProduceMime();
}
public List<MediaType> getConsumeMime() {
@@ -272,9 +270,8 @@ public class ClassResourceInfo extends BeanResourceInfo {
Consumes consumes = AnnotationUtils.getClassAnnotation(getServiceClass(), Consumes.class);
if (consumes != null || parent == null) {
return JAXRSUtils.getConsumeTypes(consumes);
- } else {
- return parent.getConsumeMime();
}
+ return parent.getConsumeMime();
}
public Path getPath() {
@@ -285,9 +282,8 @@ public class ClassResourceInfo extends BeanResourceInfo {
public boolean isSingleton() {
if (parent == null) {
return resourceProvider != null && resourceProvider.isSingleton();
- } else {
- return parent.isSingleton();
}
+ return parent.isSingleton();
}
public void setParent(ClassResourceInfo parent) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
index 76efb88..48ec5cf 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
@@ -146,11 +146,10 @@ public class OperationResourceInfo {
Set<String> criNames = classResourceInfo.getNameBindings();
if (criNames.isEmpty()) {
return nameBindings;
- } else {
- Set<String> all = new LinkedHashSet<String>(criNames);
- all.addAll(nameBindings);
- return all;
}
+ Set<String> all = new LinkedHashSet<String>(criNames);
+ all.addAll(nameBindings);
+ return all;
}
private void checkOneway() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/Parameter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/Parameter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/Parameter.java
index 33aeb86..eb6d464 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/Parameter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/Parameter.java
@@ -98,8 +98,7 @@ public class Parameter {
public Class<?> getJavaType() {
if (javaType == null) {
return type == ParameterType.REQUEST_BODY ? InputStream.class : String.class;
- } else {
- return javaType;
}
+ return javaType;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
index 1d14957..974e819 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
@@ -478,18 +478,16 @@ public final class URITemplate {
public boolean matches(String value) {
if (pattern == null) {
return true;
- } else {
- return pattern.matcher(value).matches();
}
+ return pattern.matcher(value).matches();
}
@Override
public String getValue() {
if (pattern != null) {
return "{" + name + ":" + pattern + "}";
- } else {
- return "{" + name + "}";
}
+ return "{" + name + "}";
}
}
@@ -566,9 +564,8 @@ public final class URITemplate {
public static String stripBraces(String token) {
if (insideBraces(token)) {
return token.substring(1, token.length() - 1);
- } else {
- return token;
}
+ return token;
}
public boolean hasNext() {
@@ -578,9 +575,8 @@ public final class URITemplate {
public String next() {
if (hasNext()) {
return tokens.get(tokenIdx++);
- } else {
- throw new IllegalStateException("no more elements");
}
+ throw new IllegalStateException("no more elements");
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/doc/JavaDocProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/doc/JavaDocProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/doc/JavaDocProvider.java
index 90e3b45..7ac4c17 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/doc/JavaDocProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/doc/JavaDocProvider.java
@@ -135,9 +135,8 @@ public class JavaDocProvider implements DocumentationProvider {
List<String> params = doc.getParamInfo();
if (paramIndex < params.size()) {
return params.get(paramIndex);
- } else {
- return null;
}
+ return null;
} catch (Exception ex) {
// ignore
}
@@ -256,9 +255,8 @@ public class JavaDocProvider implements DocumentationProvider {
paramDocs.add(param);
if (next == paramString.length()) {
break;
- } else {
- codeIndex = next + 1;
}
+ codeIndex = next + 1;
codeIndex = paramString.indexOf(codeTag, codeIndex);
}
@@ -290,16 +288,14 @@ public class JavaDocProvider implements DocumentationProvider {
protected String getClassInfoTag() {
if (javaDocsBuiltByVersion == JAVA_VERSION_16) {
return "<P>";
- } else {
- return "<div class=\"block\">";
}
+ return "<div class=\"block\">";
}
protected String getOperInfoTag() {
if (javaDocsBuiltByVersion == JAVA_VERSION_16) {
return "<DD>";
- } else {
- return "<div class=\"block\">";
}
+ return "<div class=\"block\">";
}
protected String getOperLink() {
String operLink = "<A NAME=\"";
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProvider.java
index 9b15e78..d8e6c3e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProvider.java
@@ -158,9 +158,8 @@ public abstract class AbstractConfigurableProvider {
protected boolean isPayloadEmpty(HttpHeaders headers) {
if (headers != null) {
return isPayloadEmpty(headers.getRequestHeaders());
- } else {
- return false;
}
+ return false;
}
protected boolean isPayloadEmpty(MultivaluedMap<String, String> headers) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index 6ef6b1b..9c6c612 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -676,10 +676,9 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
if (schema != null) {
return schema;
- } else {
- SchemaHandler handler = schemaHandlers.get(cls.getName());
- return handler != null ? handler.getSchema() : null;
}
+ SchemaHandler handler = schemaHandlers.get(cls.getName());
+ return handler != null ? handler.getSchema() : null;
}
@@ -815,9 +814,8 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
} catch (XMLStreamException ex) {
throw ExceptionUtils.toInternalServerErrorException(ex, null);
}
- } else {
- return reader;
}
+ return reader;
}
protected DocumentDepthProperties getDepthProperties() {
@@ -919,20 +917,18 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
theList.get(i), adapter, false);
}
return values;
- } else {
- if (!adapterChecked && adapter != null) {
- List<Object> newList = new ArrayList<>(theList.size());
- for (Object o : theList) {
- newList.add(org.apache.cxf.jaxrs.utils.JAXBUtils.useAdapter(o, adapter, false));
- }
- theList = newList;
- }
- if (collectionType == Set.class) {
- return new HashSet<>(theList);
- } else {
- return theList;
+ }
+ if (!adapterChecked && adapter != null) {
+ List<Object> newList = new ArrayList<>(theList.size());
+ for (Object o : theList) {
+ newList.add(org.apache.cxf.jaxrs.utils.JAXBUtils.useAdapter(o, adapter, false));
}
+ theList = newList;
+ }
+ if (collectionType == Set.class) {
+ return new HashSet<>(theList);
}
+ return theList;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
index c08df4e..dcead64 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
@@ -245,9 +245,8 @@ public class BinaryDataProvider<T> extends AbstractConfigurableProvider
Message message = PhaseInterceptorChain.getCurrentMessage();
if (message != null) {
return MessageUtils.isTrue(message.get(HTTP_RANGE_PROPERTY));
- } else {
- return false;
}
+ return false;
}
public void setReportByteArraySize(boolean report) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyReader.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyReader.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyReader.java
index cd8577d..62751af 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyReader.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyReader.java
@@ -43,9 +43,8 @@ public class CachingMessageBodyReader<T> extends AbstractCachingMessageProvider<
public boolean isReadable(Class<?> type, Type gType, Annotation[] anns, MediaType mt) {
if (delegatingReaders != null) {
return getDelegatingReader(type, gType, anns, mt) != null;
- } else {
- return isProviderKeyNotSet();
}
+ return isProviderKeyNotSet();
}
private MessageBodyReader<T> getDelegatingReader(Class<?> type, Type gType, Annotation[] anns, MediaType mt) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyWriter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyWriter.java
index b3613ac..e1b76b2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyWriter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyWriter.java
@@ -47,9 +47,8 @@ public class CachingMessageBodyWriter<T> extends AbstractCachingMessageProvider<
public boolean isWriteable(Class<?> type, Type gType, Annotation[] anns, MediaType mt) {
if (delegatingWriters != null) {
return getDelegatingWriter(type, gType, anns, mt) != null;
- } else {
- return isProviderKeyNotSet();
}
+ return isProviderKeyNotSet();
}
private MessageBodyWriter<T> getDelegatingWriter(Class<?> type, Type gType, Annotation[] anns, MediaType mt) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBAttachmentMarshaller.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBAttachmentMarshaller.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBAttachmentMarshaller.java
index 95dfe3b..1910dce 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBAttachmentMarshaller.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBAttachmentMarshaller.java
@@ -53,9 +53,8 @@ public class JAXBAttachmentMarshaller extends AttachmentMarshaller {
if (att != null) {
atts.add(att);
return "cid:" + att.getId();
- } else {
- return null;
}
+ return null;
}
@@ -65,9 +64,8 @@ public class JAXBAttachmentMarshaller extends AttachmentMarshaller {
if (att != null) {
atts.add(att);
return "cid:" + att.getId();
- } else {
- return null;
}
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
index 328f63a..966e339 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
@@ -163,9 +163,8 @@ public class JAXBElementProvider<T> extends AbstractJAXBProvider<T> {
if (isPayloadEmpty(headers)) {
if (AnnotationUtils.getAnnotation(anns, Nullable.class) != null) {
return null;
- } else {
- reportEmptyContentLength();
}
+ reportEmptyContentLength();
}
XMLStreamReader reader = null;
@@ -268,9 +267,8 @@ public class JAXBElementProvider<T> extends AbstractJAXBProvider<T> {
reader = createDepthReaderIfNeeded(reader, is);
if (InjectionUtils.isSupportedCollectionOrArray(type)) {
return new JAXBCollectionWrapperReader(TransformUtils.createNewReaderIfNeeded(reader, is));
- } else {
- return reader;
}
+ return reader;
}
@@ -510,9 +508,8 @@ public class JAXBElementProvider<T> extends AbstractJAXBProvider<T> {
builder = mc.getUriInfo().getBaseUriBuilder();
}
return builder.path(path).path(xmlResourceOffset).build().toString();
- } else {
- return path;
}
+ return path;
}
@@ -541,9 +538,8 @@ public class JAXBElementProvider<T> extends AbstractJAXBProvider<T> {
// TODO: there has to be a better fix
String propertyName = write ? "WRITE-" + Message.ATTACHMENTS : Message.ATTACHMENTS;
return CastUtils.cast((Collection<?>)mc.get(propertyName));
- } else {
- return null;
}
+ return null;
}
//CHECKSTYLE:OFF
protected void marshal(Object obj, Class<?> cls, Type genericType,
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
index a14958a..fe6aaff 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
@@ -174,9 +174,8 @@ public class MultipartProvider extends AbstractConfigurableProvider
&& !MessageUtils.isTrue(mc.getContextualProperty(SINGLE_PART_IS_COLLECTION))) {
List<Attachment> allMultiparts = AttachmentUtils.getMatchingAttachments(id, infos);
return getAttachmentCollection(t, allMultiparts, anns);
- } else {
- return fromAttachment(multipart, c, t, anns);
}
+ return fromAttachment(multipart, c, t, anns);
}
if (id != null && !id.required()) {
@@ -292,22 +291,20 @@ public class MultipartProvider extends AbstractConfigurableProvider
handlers.add(handler);
}
return handlers;
- } else {
- String rootMediaType = getRootMediaType(anns, mt);
- if (List.class.isAssignableFrom(obj.getClass())) {
- return getAttachments((List<?>)obj, rootMediaType);
- } else {
- if (MultipartBody.class.isAssignableFrom(type)) {
- List<Attachment> atts = ((MultipartBody)obj).getAllAttachments();
- // these attachments may have no DataHandlers, but objects only
- return getAttachments(atts, rootMediaType);
- }
- Attachment handler = createDataHandler(obj,
- genericType, anns,
- rootMediaType, mt.toString(), 1);
- return Collections.singletonList(handler);
- }
}
+ String rootMediaType = getRootMediaType(anns, mt);
+ if (List.class.isAssignableFrom(obj.getClass())) {
+ return getAttachments((List<?>)obj, rootMediaType);
+ }
+ if (MultipartBody.class.isAssignableFrom(type)) {
+ List<Attachment> atts = ((MultipartBody)obj).getAllAttachments();
+ // these attachments may have no DataHandlers, but objects only
+ return getAttachments(atts, rootMediaType);
+ }
+ Attachment handler = createDataHandler(obj,
+ genericType, anns,
+ rootMediaType, mt.toString(), 1);
+ return Collections.singletonList(handler);
}
private List<Attachment> getAttachments(List<?> objects, String rootMediaType) throws IOException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index 9ceed02..ac5b8dc 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -279,9 +279,8 @@ public abstract class ProviderFactory {
ParamConverter<T> converter = pi.getProvider().getConverter(paramType, genericType, anns);
if (converter != null) {
return converter;
- } else {
- pi.clearThreadLocalProxies();
}
+ pi.clearThreadLocalProxies();
}
return null;
}
@@ -380,9 +379,8 @@ public abstract class ProviderFactory {
}
return interceptors;
- } else {
- return null;
}
+ return null;
}
public <T> List<WriterInterceptor> createMessageBodyWriterInterceptor(Class<T> bodyType,
@@ -419,9 +417,8 @@ public abstract class ProviderFactory {
}
return interceptors;
- } else {
- return null;
}
+ return null;
}
@@ -1158,9 +1155,8 @@ public abstract class ProviderFactory {
boolean isApplication = Application.class.isAssignableFrom(c.getDeclaringClass());
if (isApplication) {
return new ApplicationInfo((Application)instance, proxies, theBus);
- } else {
- return new ProviderInfo<Object>(instance, proxies, theBus, checkContexts, custom);
}
+ return new ProviderInfo<Object>(instance, proxies, theBus, checkContexts, custom);
}
protected static class NameKey {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
index a715500..7624770 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
@@ -134,9 +134,8 @@ public class RequestDispatcherProvider extends AbstractConfigurableProvider
RequestDispatcherProvider.class,
getBus()) != null) {
return resourceName;
- } else {
- return null;
}
+ return null;
}
public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mt) {
@@ -173,9 +172,8 @@ public class RequestDispatcherProvider extends AbstractConfigurableProvider
}
}
return false;
- } else {
- return classResources.containsKey(typeName);
}
+ return classResources.containsKey(typeName);
}
public void writeTo(Object o, Class<?> clazz, Type genericType, Annotation[] annotations,
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
index 86a417e..ecc5867 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
@@ -105,9 +105,8 @@ public final class ServerProviderFactory extends ProviderFactory {
Object provider = createProvider(WADL_PROVIDER_NAME, bus);
if (provider == null) {
return null;
- } else {
- return new ProviderInfo<ContainerRequestFilter>((ContainerRequestFilter)provider, bus, true);
}
+ return new ProviderInfo<ContainerRequestFilter>((ContainerRequestFilter)provider, bus, true);
}
public static ServerProviderFactory getInstance() {
@@ -314,9 +313,8 @@ public final class ServerProviderFactory extends ProviderFactory {
}
if (WADL_PROVIDER_NAME.equals(filterCls.getName())) {
return true;
- } else {
- return isWadlGenerator(filterCls.getSuperclass());
}
+ return isWadlGenerator(filterCls.getSuperclass());
}
public RequestPreprocessor getRequestPreprocessor() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
index 59cc20d..c45d912 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
@@ -105,9 +105,8 @@ public class SourceProvider<T> extends AbstractConfigurableProvider implements
} catch (XMLStreamException e) {
if (e.getMessage() != null && e.getMessage().startsWith("Maximum Number")) {
throw ExceptionUtils.toWebApplicationException(null, JAXRSUtils.toResponse(413));
- } else {
- throw ExceptionUtils.toBadRequestException(e, null);
}
+ throw ExceptionUtils.toBadRequestException(e, null);
} catch (Exception e) {
IOException ioex = new IOException("Problem creating a Source object");
ioex.setStackTrace(e.getStackTrace());
@@ -153,9 +152,8 @@ public class SourceProvider<T> extends AbstractConfigurableProvider implements
} catch (XMLStreamException ex) {
throw ExceptionUtils.toInternalServerErrorException(ex, null);
}
- } else {
- return reader;
}
+ return reader;
}
protected InputStream getRealStream(InputStream is) throws IOException {
@@ -178,9 +176,8 @@ public class SourceProvider<T> extends AbstractConfigurableProvider implements
MessageContext mc = getContext();
if (mc != null) {
return mc.getContent(XMLStreamReader.class);
- } else {
- return null;
}
+ return null;
}
public void writeTo(T source, Class<?> clazz, Type genericType, Annotation[] annotations,
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
index a533e36..d85a0da 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
@@ -129,9 +129,8 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> {
// is in that list then it can only be handled by the template
if (inClassCanBeHandled(type.getName()) || inClassesToHandle == null && !supportJaxbOnly) {
return inTemplatesAvailable(type, anns, mt);
- } else {
- return supportJaxbOnly;
}
+ return supportJaxbOnly;
}
@Override
@@ -148,9 +147,8 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> {
// is in that list then it can only be handled by the template
if (outClassCanBeHandled(type.getName()) || outClassesToHandle == null && !supportJaxbOnly) {
return outTemplatesAvailable(type, anns, mt);
- } else {
- return supportJaxbOnly;
}
+ return supportJaxbOnly;
}
protected boolean inTemplatesAvailable(Class<?> cls, Annotation[] anns, MediaType mt) {
@@ -443,10 +441,9 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> {
if (templates == null) {
if (supportJaxbOnly) {
return null;
- } else {
- LOG.severe("No template is available");
- throw ExceptionUtils.toInternalServerErrorException(null, null);
}
+ LOG.severe("No template is available");
+ throw ExceptionUtils.toInternalServerErrorException(null, null);
}
TemplatesImpl templ = new TemplatesImpl(templates, uriResolver);
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
index fbdbac4..cbf383f 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
@@ -139,28 +139,27 @@ public class JAASAuthenticationFilter implements ContainerRequestFilter {
return Response.status(getRedirectStatus()).
header(HttpHeaders.LOCATION, finalRedirectURI).build();
- } else {
- ResponseBuilder builder = Response.status(Response.Status.UNAUTHORIZED);
+ }
+ ResponseBuilder builder = Response.status(Response.Status.UNAUTHORIZED);
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder();
- List<String> authHeader = headers.getRequestHeader(HttpHeaders.AUTHORIZATION);
- if (authHeader != null && !authHeader.isEmpty()) {
- // should HttpHeadersImpl do it ?
- String[] authValues = StringUtils.split(authHeader.get(0), " ");
- if (authValues.length > 0) {
- sb.append(authValues[0]);
- }
- } else {
- sb.append("Basic");
- }
- if (realmName != null) {
- sb.append(" realm=\"").append(realmName).append('"');
+ List<String> authHeader = headers.getRequestHeader(HttpHeaders.AUTHORIZATION);
+ if (authHeader != null && !authHeader.isEmpty()) {
+ // should HttpHeadersImpl do it ?
+ String[] authValues = StringUtils.split(authHeader.get(0), " ");
+ if (authValues.length > 0) {
+ sb.append(authValues[0]);
}
- builder.header(HttpHeaders.WWW_AUTHENTICATE, sb.toString());
-
- return builder.build();
+ } else {
+ sb.append("Basic");
}
+ if (realmName != null) {
+ sb.append(" realm=\"").append(realmName).append('"');
+ }
+ builder.header(HttpHeaders.WWW_AUTHENTICATE, sb.toString());
+
+ return builder.build();
}
protected Response.Status getRedirectStatus() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
index 4b34eea..c3c2d5a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
@@ -167,17 +167,15 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
String param = servletConfig.getInitParameter(PARAMETER_SPLIT_CHAR);
if (!StringUtils.isEmpty(param) && SPACE_PARAMETER_SPLIT_CHAR.equals(param.trim())) {
return " ";
- } else {
- return DEFAULT_PARAMETER_SPLIT_CHAR;
}
+ return DEFAULT_PARAMETER_SPLIT_CHAR;
}
protected boolean getStaticSubResolutionValue(ServletConfig servletConfig) {
String param = servletConfig.getInitParameter(STATIC_SUB_RESOLUTION_PARAM);
if (param != null) {
return Boolean.valueOf(param.trim());
- } else {
- return false;
}
+ return false;
}
protected void setExtensions(JAXRSServerFactoryBean bean, ServletConfig servletConfig) {
@@ -391,9 +389,8 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
list.add(value);
}
return map;
- } else {
- return Collections.emptyMap();
}
+ return Collections.emptyMap();
}
protected Map<Class<?>, ResourceProvider> getResourceProviders(ServletConfig servletConfig,
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
index 3e808e6..3d39a46 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
@@ -212,9 +212,8 @@ public abstract class AbstractSpringComponentScanServer extends AbstractSpringCo
if (Proxy.isProxyClass(type)) {
LOG.fine("Can not determine the real class of the component '" + beanName + "'");
return false;
- } else {
- return true;
}
+ return true;
}
protected boolean matchesComponentName(String beanName, Set<String> componentScanBeansSet) {
return componentScanBeansSet == null || componentScanBeansSet.contains(beanName);
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
index 1ba53ef..ce8b360 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
@@ -79,9 +79,8 @@ public abstract class AbstractSpringConfigurationFactory
protected String getAddress() {
if (!StringUtils.isEmpty(jaxrsServerAddress)) {
return jaxrsServerAddress;
- } else {
- return "/";
}
+ return "/";
}
protected String getTransportId() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
index c748ebc..c55ceba 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
@@ -100,16 +100,15 @@ public class SpringResourceFactory implements ResourceProvider, ApplicationConte
public Object getInstance(Message m) {
if (singletonInstance != null) {
return singletonInstance;
- } else {
- ProviderInfo<?> application = m == null ? null
- : (ProviderInfo<?>)m.getExchange().getEndpoint().get(Application.class.getName());
- Map<Class<?>, Object> mapValues = CastUtils.cast(application == null ? null
- : Collections.singletonMap(Application.class, application.getProvider()));
- Object[] values = ResourceUtils.createConstructorArguments(c, m, !isSingleton(), mapValues);
- Object instance = values.length > 0 ? ac.getBean(beanId, values) : ac.getBean(beanId);
- initInstance(m, instance);
- return instance;
}
+ ProviderInfo<?> application = m == null ? null
+ : (ProviderInfo<?>)m.getExchange().getEndpoint().get(Application.class.getName());
+ Map<Class<?>, Object> mapValues = CastUtils.cast(application == null ? null
+ : Collections.singletonMap(Application.class, application.getProvider()));
+ Object[] values = ResourceUtils.createConstructorArguments(c, m, !isSingleton(), mapValues);
+ Object instance = values.length > 0 ? ac.getBean(beanId, values) : ac.getBean(beanId);
+ initInstance(m, instance);
+ return instance;
}
protected void initInstance(Message m, Object instance) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index e1b6c35..dc8c8a7 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -300,9 +300,8 @@ public final class HttpUtils {
if (locale == null) {
return new Locale(language);
- } else {
- return new Locale(language, locale);
}
+ return new Locale(language, locale);
}
@@ -321,20 +320,19 @@ public final class HttpUtils {
public static String getHeaderString(List<String> values) {
if (values == null) {
return null;
- } else {
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < values.size(); i++) {
- String value = values.get(i);
- if (StringUtils.isEmpty(value)) {
- continue;
- }
- sb.append(value);
- if (i + 1 < values.size()) {
- sb.append(",");
- }
+ }
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < values.size(); i++) {
+ String value = values.get(i);
+ if (StringUtils.isEmpty(value)) {
+ continue;
+ }
+ sb.append(value);
+ if (i + 1 < values.size()) {
+ sb.append(",");
}
- return sb.toString();
}
+ return sb.toString();
}
public static boolean isDateRelatedHeader(String headerName) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index 550bed5..bc05ca1 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -161,9 +161,8 @@ public final class InjectionUtils {
ParameterizedType type = (ParameterizedType) scope;
if (type.getRawType() == declaration) {
return type;
- } else {
- scope = type.getRawType();
}
+ scope = type.getRawType();
}
if (scope instanceof Class) {
Class<?> classScope = (Class<?>)scope;
@@ -575,9 +574,8 @@ public final class InjectionUtils {
BUNDLE,
cls.getName()).toString());
throw new WebApplicationException(t, HttpUtils.getParameterFailureStatus(pType));
- } else {
- return result;
}
+ return result;
}
private static <T> T evaluateFactoryMethod(String value,
@@ -771,22 +769,21 @@ public final class InjectionUtils {
}
}
return theValues;
- } else {
- Map<Object, Object> theValues = new HashMap<>();
- Class<?> valueType =
- (Class<?>) InjectionUtils.getType(paramType.getActualTypeArguments(), 1);
- for (Map.Entry<String, List<String>> processedValuesEntry : processedValues.entrySet()) {
- List<String> valuesList = processedValuesEntry.getValue();
- for (String value : valuesList) {
- Object o = InjectionUtils.handleParameter(value,
- decoded, valueType, valueType, paramAnns, pathParam, message);
- theValues.put(
- convertStringToPrimitive(processedValuesEntry.getKey(), keyType),
- o);
- }
+ }
+ Map<Object, Object> theValues = new HashMap<>();
+ Class<?> valueType =
+ (Class<?>) InjectionUtils.getType(paramType.getActualTypeArguments(), 1);
+ for (Map.Entry<String, List<String>> processedValuesEntry : processedValues.entrySet()) {
+ List<String> valuesList = processedValuesEntry.getValue();
+ for (String value : valuesList) {
+ Object o = InjectionUtils.handleParameter(value,
+ decoded, valueType, valueType, paramAnns, pathParam, message);
+ theValues.put(
+ convertStringToPrimitive(processedValuesEntry.getKey(), keyType),
+ o);
}
- return theValues;
}
+ return theValues;
}
@@ -1384,9 +1381,8 @@ public final class InjectionUtils {
}
if (param == ParameterType.PATH || param == ParameterType.MATRIX) {
return HttpUtils.pathDecode(value);
- } else {
- return HttpUtils.urlDecode(value);
}
+ return HttpUtils.urlDecode(value);
}
public static void invokeLifeCycleMethod(Object instance, Method method) {
@@ -1459,9 +1455,8 @@ public final class InjectionUtils {
if (targetObject != null) {
Class<?> targetClass = targetObject.getClass();
return ClassHelper.getRealClassFromClass(targetClass);
- } else {
- return null;
}
+ return null;
}
public static Type getGenericResponseType(Method invoked,
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
index e41aa72..20623ec 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
@@ -134,9 +134,8 @@ public final class JAXBUtils {
XmlAdapter xmlAdapter = typeAdapter.value().newInstance();
if (marshal) {
return xmlAdapter.marshal(obj);
- } else {
- return xmlAdapter.unmarshal(obj);
}
+ return xmlAdapter.unmarshal(obj);
} catch (Exception ex) {
LOG.log(Level.INFO, "(un)marshalling failed, using defaultValue", ex);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 4c286a6..b8a3020 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -214,18 +214,16 @@ public final class JAXRSUtils {
if (values == null) {
return getConsumeTypes(provider.getClass().getAnnotation(Consumes.class));
- } else {
- return JAXRSUtils.getMediaTypes(values);
}
+ return JAXRSUtils.getMediaTypes(values);
}
public static List<MediaType> getProviderProduceTypes(MessageBodyWriter<?> provider) {
String[] values = getUserMediaTypes(provider, false);
if (values == null) {
return getProduceTypes(provider.getClass().getAnnotation(Produces.class));
- } else {
- return JAXRSUtils.getMediaTypes(values);
}
+ return JAXRSUtils.getMediaTypes(values);
}
public static List<MediaType> getMediaTypes(String[] values) {
@@ -916,17 +914,16 @@ public final class JAXRSUtils {
if ("".equals(key)) {
return InjectionUtils.handleBean(pClass, paramAnns, params, ParameterType.MATRIX, m, false);
- } else {
- List<String> values = params.get(key);
- return InjectionUtils.createParameterObject(values,
- pClass,
- genericType,
- paramAnns,
- defaultValue,
- false,
- ParameterType.MATRIX,
- m);
}
+ List<String> values = params.get(key);
+ return InjectionUtils.createParameterObject(values,
+ pClass,
+ genericType,
+ paramAnns,
+ defaultValue,
+ false,
+ ParameterType.MATRIX,
+ m);
}
return null;
@@ -971,19 +968,17 @@ public final class JAXRSUtils {
if ("".equals(key)) {
return InjectionUtils.handleBean(pClass, paramAnns, params, ParameterType.FORM, m, false);
- } else {
- List<String> results = params.get(key);
-
- return InjectionUtils.createParameterObject(results,
- pClass,
- genericType,
- paramAnns,
- defaultValue,
- false,
- ParameterType.FORM,
- m);
-
}
+ List<String> results = params.get(key);
+
+ return InjectionUtils.createParameterObject(results,
+ pClass,
+ genericType,
+ paramAnns,
+ defaultValue,
+ false,
+ ParameterType.FORM,
+ m);
}
@@ -1166,17 +1161,16 @@ public final class JAXRSUtils {
//CHECKSTYLE:ON
if ("".equals(parameterName)) {
return InjectionUtils.handleBean(paramType, paramAnns, values, ParameterType.PATH, m, decoded);
- } else {
- List<String> results = values.get(parameterName);
- return InjectionUtils.createParameterObject(results,
- paramType,
- genericType,
- paramAnns,
- defaultValue,
- decoded,
- ParameterType.PATH,
- m);
}
+ List<String> results = values.get(parameterName);
+ return InjectionUtils.createParameterObject(results,
+ paramType,
+ genericType,
+ paramAnns,
+ defaultValue,
+ decoded,
+ ParameterType.PATH,
+ m);
}
@@ -1194,15 +1188,14 @@ public final class JAXRSUtils {
if ("".equals(queryName)) {
return InjectionUtils.handleBean(paramType, paramAnns, queryMap, ParameterType.QUERY, m, false);
- } else {
- return InjectionUtils.createParameterObject(queryMap.get(queryName),
- paramType,
- genericType,
- paramAnns,
- defaultValue,
- false,
- ParameterType.QUERY, m);
}
+ return InjectionUtils.createParameterObject(queryMap.get(queryName),
+ paramType,
+ genericType,
+ paramAnns,
+ defaultValue,
+ false,
+ ParameterType.QUERY, m);
}
@@ -1312,9 +1305,8 @@ public final class JAXRSUtils {
} catch (IOException e) {
if (e.getClass().getName().equals(NO_CONTENT_EXCEPTION)) {
throw ExceptionUtils.toBadRequestException(e, null);
- } else {
- throw e;
}
+ throw e;
} catch (WebApplicationException ex) {
throw ex;
} catch (Exception ex) {
@@ -1347,14 +1339,13 @@ public final class JAXRSUtils {
readers);
return first.aroundReadFrom(context);
- } else {
- MessageBodyReader<?> provider = ((ReaderInterceptorMBR)readers.get(0)).getMBR();
- @SuppressWarnings("rawtypes")
- Class cls = targetTypeClass;
- return provider.readFrom(
- cls, parameterType, parameterAnnotations, mediaType,
- new HttpHeadersImpl(m).getRequestHeaders(), is);
}
+ MessageBodyReader<?> provider = ((ReaderInterceptorMBR)readers.get(0)).getMBR();
+ @SuppressWarnings("rawtypes")
+ Class cls = targetTypeClass;
+ return provider.readFrom(
+ cls, parameterType, parameterAnnotations, mediaType,
+ new HttpHeadersImpl(m).getRequestHeaders(), is);
}
@@ -1710,9 +1701,8 @@ public final class JAXRSUtils {
public static MediaType toMediaType(String value) {
if (value == null) {
return ALL_TYPES;
- } else {
- return MediaTypeHeaderProvider.valueOf(value);
}
+ return MediaTypeHeaderProvider.valueOf(value);
}
public static Response toResponse(int status) {
@@ -1761,9 +1751,8 @@ public final class JAXRSUtils {
}
}
return r;
- } else {
- return response;
}
+ return response;
}
public static Message getCurrentMessage() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
index 31b38a5..36e1ced 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
@@ -359,10 +359,9 @@ public final class ResourceUtils {
}
if (m.getReturnType() == Void.TYPE || m.getReturnType() == Void.class) {
return true;
- } else {
- reportInvalidResourceMethod(m, NO_VOID_RETURN_ASYNC_MESSAGE_ID, Level.WARNING);
- return false;
}
+ reportInvalidResourceMethod(m, NO_VOID_RETURN_ASYNC_MESSAGE_ID, Level.WARNING);
+ return false;
}
}
return true;
@@ -899,9 +898,8 @@ public final class ResourceUtils {
Constructor<?> c = ResourceUtils.findResourceConstructor(cls, false);
if (c.getParameterTypes().length == 0) {
return c.newInstance();
- } else {
- return c;
}
+ return c;
} catch (Throwable ex) {
throw new RuntimeException("Provider " + cls.getName() + " can not be created", ex);
}
@@ -945,9 +943,8 @@ public final class ResourceUtils {
if (map.contains(s.getClass().getName())) {
throw new RuntimeException("More than one instance of the same singleton class "
+ s.getClass().getName() + " is available");
- } else {
- map.add(s.getClass().getName());
}
+ map.add(s.getClass().getName());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/SpecExceptions.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/SpecExceptions.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/SpecExceptions.java
index 5b22e99..d3805ad 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/SpecExceptions.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/SpecExceptions.java
@@ -121,8 +121,7 @@ final class SpecExceptions {
private static Response checkResponse(Response r, int status) {
if (r == null) {
return JAXRSUtils.toResponse(status);
- } else {
- return r;
}
+ return r;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
index 68793fe..0ad6a43 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
@@ -178,9 +178,8 @@ public final class AttachmentUtils {
LOG.warning(errorMsg.toString());
throw ExceptionUtils.toBadRequestException(
new MultipartReadException(id.value(), id.type(), errorMsg.toString()), null);
- } else {
- return null;
}
+ return null;
}
return !infos.isEmpty() ? infos.get(0) : null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/ValidationExceptionMapper.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/ValidationExceptionMapper.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/ValidationExceptionMapper.java
index d8ea2fb..87a39ca 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/ValidationExceptionMapper.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/ValidationExceptionMapper.java
@@ -60,9 +60,8 @@ public class ValidationExceptionMapper implements ExceptionMapper<ValidationExce
errorStatus = Response.Status.BAD_REQUEST;
}
return buildResponse(errorStatus, responseBody != null ? responseBody.toString() : null);
- } else {
- return buildResponse(errorStatus, addMessageToResponse ? exception.getMessage() : null);
}
+ return buildResponse(errorStatus, addMessageToResponse ? exception.getMessage() : null);
}
protected String buildErrorMessage(ConstraintViolation<?> violation) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/ValidationUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/ValidationUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/ValidationUtils.java
index bb10d5b..0dab2aa 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/ValidationUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/ValidationUtils.java
@@ -43,9 +43,8 @@ public final class ValidationUtils {
String error = "Service object is not a singleton, use a custom invoker to validate";
LOG.warning(error);
return null;
- } else {
- return resourceProvider.getInstance(message);
}
+ return resourceProvider.getInstance(message);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerParameterHandler.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerParameterHandler.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerParameterHandler.java
index ff4ab4f..fd3d8cd 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerParameterHandler.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerParameterHandler.java
@@ -33,9 +33,8 @@ public class CustomerParameterHandler implements ParamConverterProvider, ParamCo
public <T> ParamConverter<T> getConverter(Class<T> cls, Type arg1, Annotation[] arg2) {
if (Customer.class == cls) {
return (ParamConverter<T>)this;
- } else {
- return null;
}
+ return null;
}
public Customer fromString(String s) throws IllegalArgumentException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 7ecfa0f..e7b2bc8 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -468,9 +468,8 @@ public class ResponseImplTest extends Assert {
throws IllegalArgumentException {
if (arg0 == StringBean.class) {
return (HeaderDelegate<T>) new StringBeanHeaderDelegate();
- } else {
- return original.createHeaderDelegate(arg0);
}
+ return original.createHeaderDelegate(arg0);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index ecd3fd5..a67b83f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -211,6 +211,7 @@ public class JAXRSUtilsTest extends Assert {
assertEquals("customerContext", context.get());
}
+ @SuppressWarnings("cast")
@Test
public void testInjectApplicationInSingleton() throws Exception {
CustomerApplication app = new CustomerApplication();
@@ -231,6 +232,7 @@ public class JAXRSUtilsTest extends Assert {
assertTrue(proxy.get() instanceof UriInfo);
}
+ @SuppressWarnings("cast")
@Test
public void testInjectApplicationInPerRequestResource() throws Exception {
CustomerApplication app = new CustomerApplication();
@@ -2122,9 +2124,8 @@ public class JAXRSUtilsTest extends Assert {
public <T> ParamConverter<T> getConverter(Class<T> cls, Type arg1, Annotation[] arg2) {
if (cls == Locale.class) {
return (ParamConverter<T>)this;
- } else {
- return null;
}
+ return null;
}
public Locale fromString(String s) {
@@ -2148,9 +2149,8 @@ public class JAXRSUtilsTest extends Assert {
public <T> ParamConverter<T> getConverter(Class<T> cls, Type arg1, Annotation[] arg2) {
if (cls == Query.class) {
return (ParamConverter<T>)this;
- } else {
- return null;
}
+ return null;
}
public Query<String> fromString(String s) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
index f6e2e2b..04dad0b 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
@@ -836,11 +836,10 @@ public class EndpointImpl extends javax.xml.ws.Endpoint
Element... referenceParameters) {
if (W3CEndpointReference.class.isAssignableFrom(clazz)) {
return clazz.cast(getEndpointReference(referenceParameters));
- } else {
- throw new WebServiceException(new org.apache.cxf.common.i18n.Message(
- "ENDPOINTREFERENCE_TYPE_NOT_SUPPORTED", LOG, clazz
- .getName()).toString());
}
+ throw new WebServiceException(new org.apache.cxf.common.i18n.Message(
+ "ENDPOINTREFERENCE_TYPE_NOT_SUPPORTED", LOG, clazz
+ .getName()).toString());
}
public void setEndpointContext(EndpointContext ctxt) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
index f6a1f01..a363f6e 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
@@ -127,10 +127,9 @@ public class WebServiceContextImpl implements WebServiceContext {
Element... referenceParameters) {
if (W3CEndpointReference.class.isAssignableFrom(clazz)) {
return clazz.cast(getEndpointReference(referenceParameters));
- } else {
- throw new WebServiceException(new Message("ENDPOINTREFERENCE_TYPE_NOT_SUPPORTED",
- LOG, clazz.getName()).toString());
}
+ throw new WebServiceException(new Message("ENDPOINTREFERENCE_TYPE_NOT_SUPPORTED",
+ LOG, clazz.getName()).toString());
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
index 466dd69..990e02f 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
@@ -433,9 +433,8 @@ public class WrappedMessageContext implements MessageContext {
if (tmp != null) {
if (MessageContext.HTTP_RESPONSE_HEADERS.equals(key)) {
return tmp.put(Message.PROTOCOL_HEADERS, value);
- } else {
- return tmp.put(mappedKey, value);
}
+ return tmp.put(mappedKey, value);
}
} else if (BindingProvider.USERNAME_PROPERTY.equals(key)) {
AuthorizationPolicy authPolicy =
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
index 4223d37..3b91b72 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
@@ -112,9 +112,8 @@ public class ProviderImpl extends javax.xml.ws.spi.Provider {
Bus bus = BusFactory.getThreadDefaultBus();
ep = createEndpointImpl(bus, bindingId, implementor);
return ep;
- } else {
- throw new WebServiceException(new Message("INVALID_IMPLEMENTOR_EXC", LOG).toString());
}
+ throw new WebServiceException(new Message("INVALID_IMPLEMENTOR_EXC", LOG).toString());
}
//new in 2.2
public Endpoint createEndpoint(String bindingId,
@@ -125,9 +124,8 @@ public class ProviderImpl extends javax.xml.ws.spi.Provider {
Bus bus = BusFactory.getThreadDefaultBus();
ep = createEndpointImpl(bus, bindingId, implementor, features);
return ep;
- } else {
- throw new WebServiceException(new Message("INVALID_IMPLEMENTOR_EXC", LOG).toString());
}
+ throw new WebServiceException(new Message("INVALID_IMPLEMENTOR_EXC", LOG).toString());
}
@Override
@@ -165,9 +163,8 @@ public class ProviderImpl extends javax.xml.ws.spi.Provider {
EndpointImpl ep = new EndpointImpl(bus, null, factory);
ep.setImplementorClass(implementorClass);
return ep;
- } else {
- throw new WebServiceException(new Message("INVALID_IMPLEMENTOR_EXC", LOG).toString());
}
+ throw new WebServiceException(new Message("INVALID_IMPLEMENTOR_EXC", LOG).toString());
}
@@ -212,8 +209,6 @@ public class ProviderImpl extends javax.xml.ws.spi.Provider {
JAXBUtils.closeUnmarshaller(um);
}
return null;
- } else {
- //TODO: 200408
}
return null;
}
@@ -382,9 +377,8 @@ public class ProviderImpl extends javax.xml.ws.spi.Provider {
Exception e = pae.getException();
if (e instanceof JAXBException) {
throw (JAXBException)e;
- } else {
- throw new SecurityException(e);
}
+ throw new SecurityException(e);
}
} catch (Exception e) {
throw new WebServiceException(new Message("ERROR_UNMARSHAL_ENDPOINTREFERENCE", LOG).toString(),
@@ -424,9 +418,8 @@ public class ProviderImpl extends javax.xml.ws.spi.Provider {
throw new WebServiceException(new Message("ERROR_UNMARSHAL_ENDPOINTREFERENCE", LOG)
.toString(),
e);
- } else {
- throw new SecurityException(e);
}
+ throw new SecurityException(e);
}
}
[12/12] cxf git commit: Fix more warnings
Posted by dk...@apache.org.
Fix more warnings
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a3cd2a98
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a3cd2a98
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a3cd2a98
Branch: refs/heads/master
Commit: a3cd2a98ac535da0f0d256a70f718b68fcc2b1ba
Parents: a5dd7fa
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 14:32:38 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 14:32:38 2017 -0400
----------------------------------------------------------------------
core/pom.xml | 4 ++++
.../apache/cxf/javascript/JavascriptUtils.java | 19 ++++++++----------
.../org/apache/cxf/javascript/ParticleInfo.java | 3 +--
.../service/ServiceJavascriptBuilder.java | 9 +++------
.../apache/cxf/javascript/JsSimpleDomNode.java | 21 +++++++++-----------
.../cxf/javascript/fortest/TestBean1.java | 3 +--
.../cxf/javascript/fortest/TestBean3.java | 3 +--
.../sts/token/provider/TokenProviderUtils.java | 3 ++-
.../ws/policy/JavaFirstPolicyServiceTest.java | 16 +++++++--------
9 files changed, 37 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a3cd2a98/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index bd0f045..e1e2570 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -289,6 +289,7 @@
<extensionArgs>
<extensionArg>-Xjavadoc</extensionArg>
<extensionArg>-npa</extensionArg>
+ <extensionArg>-Xdv:attributes</extensionArg>
</extensionArgs>
</xsdOption>
<xsdOption>
@@ -297,6 +298,7 @@
<extensionArgs>
<extensionArg>-npa</extensionArg>
<extensionArg>-Xjavadoc</extensionArg>
+ <extensionArg>-Xdv:attributes</extensionArg>
</extensionArgs>
</xsdOption>
<xsdOption>
@@ -316,6 +318,7 @@
<extensionArgs>
<extensionArg>-npa</extensionArg>
<extensionArg>-Xjavadoc</extensionArg>
+ <extensionArg>-Xdv:attributes</extensionArg>
</extensionArgs>
</xsdOption>
<xsdOption>
@@ -324,6 +327,7 @@
<extensionArgs>
<extensionArg>-Xjavadoc</extensionArg>
<extensionArg>-npa</extensionArg>
+ <extensionArg>-Xdv:attributes</extensionArg>
</extensionArgs>
</xsdOption>
</xsdOptions>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a3cd2a98/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
index 6287697..c36cc24 100755
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
@@ -119,9 +119,8 @@ public class JavascriptUtils {
String val = defaultValueForSimpleType.get(type.getName());
if (val == null) { // ints and such return the appropriate 0.
return "''";
- } else {
- return val;
}
+ return val;
}
public boolean isStringSimpleType(QName typeName) {
@@ -680,14 +679,13 @@ public class JavascriptUtils {
}
}
return results;
- } else {
- // no base type, the simple case.
- XmlSchemaSequence sequence = getSequence(type);
- for (XmlSchemaSequenceMember item : sequence.getItems()) {
- results.add((XmlSchemaObject)item);
- }
- return results;
}
+ // no base type, the simple case.
+ XmlSchemaSequence sequence = getSequence(type);
+ for (XmlSchemaSequenceMember item : sequence.getItems()) {
+ results.add((XmlSchemaObject)item);
+ }
+ return results;
}
public static XmlSchemaSequence getContentSequence(XmlSchemaComplexType type) {
@@ -737,8 +735,7 @@ public class JavascriptUtils {
static String cleanedUpSchemaSource(XmlSchemaObject subject) {
if (subject == null || subject.getSourceURI() == null) {
return "";
- } else {
- return subject.getSourceURI() + ":" + subject.getLineNumber();
}
+ return subject.getSourceURI() + ":" + subject.getLineNumber();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a3cd2a98/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
index 0d36566..40cf986 100644
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
@@ -473,9 +473,8 @@ public final class ParticleInfo implements ItemInfo {
public String getDefaultValue() {
if (isOptional()) {
return "null";
- } else {
- return defaultValue;
}
+ return defaultValue;
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/a3cd2a98/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
index c103ef0..1280217 100755
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
@@ -555,12 +555,10 @@ public class ServiceJavascriptBuilder extends ServiceModelVisitor {
if (!element.isEmpty()) {
if (type instanceof XmlSchemaComplexType) {
return nameManager.getJavascriptName(element.getControllingName());
- } else {
- return "type " + type.getQName(); // could it be anonymous?
}
- } else {
- return "empty element?";
+ return "type " + type.getQName(); // could it be anonymous?
}
+ return "empty element?";
}
private void createInputSerializer() {
@@ -1009,9 +1007,8 @@ public class ServiceJavascriptBuilder extends ServiceModelVisitor {
public static String cleanedUpSchemaSource(XmlSchemaObject subject) {
if (subject == null || subject.getSourceURI() == null) {
return "";
- } else {
- return subject.getSourceURI() + ":" + subject.getLineNumber();
}
+ return subject.getSourceURI() + ":" + subject.getLineNumber();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a3cd2a98/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
index ca34be5..4a9d4d1 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
@@ -83,10 +83,10 @@ public class JsSimpleDomNode extends ScriptableObject {
public Object jsGet_firstChild() {
establishChildren();
- if (!children.isEmpty())
+ if (!children.isEmpty()) {
return children.get(0);
- else
- return null;
+ }
+ return null;
}
public Object jsGet_nextSibling() {
@@ -118,10 +118,9 @@ public class JsSimpleDomNode extends ScriptableObject {
public Object jsGet_documentElement() {
if (9 /* Document */!= wrappedNode.getNodeType()) {
return null;
- } else {
- establishChildren();
- return children.get(0); // it is, after all, just a convenience feature.
}
+ establishChildren();
+ return children.get(0); // it is, after all, just a convenience feature.
}
public Object[] jsGet_childNodes() {
@@ -139,10 +138,9 @@ public class JsSimpleDomNode extends ScriptableObject {
Node attrNode = attributes.getNamedItemNS(namespaceURI, localName);
if (attrNode == null) {
return null;
- } else {
- Attr attribute = (Attr)attrNode;
- return attribute.getValue();
}
+ Attr attribute = (Attr)attrNode;
+ return attribute.getValue();
}
public String jsFunction_getAttribute(String localName) {
@@ -150,10 +148,9 @@ public class JsSimpleDomNode extends ScriptableObject {
Node attrNode = attributes.getNamedItem(localName);
if (attrNode == null) {
return null;
- } else {
- Attr attribute = (Attr)attrNode;
- return attribute.getValue();
}
+ Attr attribute = (Attr)attrNode;
+ return attribute.getValue();
}
// CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/cxf/blob/a3cd2a98/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java
index 6db21a4..42a3035 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java
@@ -115,9 +115,8 @@ public class TestBean1 {
// decisions are simpler for the last one.
if (null == beanTwoNotRequiredItem) {
return other.beanTwoNotRequiredItem == null;
- } else {
- return beanTwoNotRequiredItem.equals(other.beanTwoNotRequiredItem);
}
+ return beanTwoNotRequiredItem.equals(other.beanTwoNotRequiredItem);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/a3cd2a98/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/TestBean3.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/TestBean3.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/TestBean3.java
index e5f078b..4c2e52a 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/TestBean3.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/TestBean3.java
@@ -109,9 +109,8 @@ public class TestBean3 {
// decisions are simpler for the last one.
if (null == beanTwoNotRequiredItem) {
return other.beanTwoNotRequiredItem == null;
- } else {
- return beanTwoNotRequiredItem.equals(other.beanTwoNotRequiredItem);
}
+ return beanTwoNotRequiredItem.equals(other.beanTwoNotRequiredItem);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/a3cd2a98/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
index 5d250fc..71e0b39 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
@@ -39,6 +39,7 @@ import org.apache.cxf.sts.request.KeyRequirements;
import org.apache.cxf.sts.service.EncryptionProperties;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.security.wss4j.WSS4JUtils;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.WSEncryptionPart;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
@@ -153,7 +154,7 @@ public final class TokenProviderUtils {
doc.appendChild(element);
WSSecEncrypt builder = new WSSecEncrypt(doc);
- if (WSHandlerConstants.USE_REQ_SIG_CERT.equals(name)) {
+ if (ConfigurationConstants.USE_REQ_SIG_CERT.equals(name)) {
X509Certificate cert = getReqSigCert(messageContext);
builder.setUseThisCert(cert);
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/a3cd2a98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
index a29903a..66c5b0f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
@@ -46,8 +46,8 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
import org.apache.neethi.Constants;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -393,18 +393,18 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
callback.setAliasPassword(username, password);
Map<String, Object> outProps = new HashMap<>();
- outProps.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- outProps.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
- outProps.put(WSHandlerConstants.PW_CALLBACK_REF, callback);
- outProps.put(WSHandlerConstants.USER, username);
+ outProps.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ outProps.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ outProps.put(ConfigurationConstants.PW_CALLBACK_REF, callback);
+ outProps.put(ConfigurationConstants.USER, username);
return outProps;
}
private Map<String, Object> getNoPasswordProperties(String username) {
Map<String, Object> outProps = new HashMap<>();
- outProps.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- outProps.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_NONE);
- outProps.put(WSHandlerConstants.USER, username);
+ outProps.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ outProps.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_NONE);
+ outProps.put(ConfigurationConstants.USER, username);
return outProps;
}
[10/12] cxf git commit: Fix static references to appropraite class
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
index 9d9e242..aa10704 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
@@ -39,7 +39,6 @@ import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
@@ -58,9 +57,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -85,7 +84,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
// Negative test for wrong password type
service.getInInterceptors().remove(inInterceptor);
- inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
+ inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -108,9 +107,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -134,7 +133,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
// Negative test for wrong password type
service.getInInterceptors().remove(inInterceptor);
- inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
+ inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -156,9 +155,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -183,7 +182,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
// Negative test for wrong password type
service.getInInterceptors().remove(inInterceptor);
- inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -205,9 +204,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -231,7 +230,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
// Negative test for wrong password type
service.getInInterceptors().remove(inInterceptor);
- inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -253,9 +252,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -289,9 +288,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -321,9 +320,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -356,7 +355,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
// expected
}
- inProperties.put(WSHandlerConstants.ALLOW_RSA15_KEY_TRANSPORT_ALGORITHM, "true");
+ inProperties.put(ConfigurationConstants.ALLOW_RSA15_KEY_TRANSPORT_ALGORITHM, "true");
assertEquals("test", echo.echo("test"));
}
@@ -366,9 +365,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -404,7 +403,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
// expected
}
- inProperties.put(WSHandlerConstants.ALLOW_RSA15_KEY_TRANSPORT_ALGORITHM, "true");
+ inProperties.put(ConfigurationConstants.ALLOW_RSA15_KEY_TRANSPORT_ALGORITHM, "true");
assertEquals("test", echo.echo("test"));
}
@@ -415,11 +414,11 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.ENCRYPT
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.USERNAME_TOKEN + " " + ConfigurationConstants.ENCRYPT
);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -459,11 +458,11 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.ENCRYPT
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.USERNAME_TOKEN + " " + ConfigurationConstants.ENCRYPT
);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -501,9 +500,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -536,9 +535,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -568,11 +567,11 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.USERNAME_TOKEN
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.USERNAME_TOKEN
);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -615,11 +614,11 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.USERNAME_TOKEN
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.USERNAME_TOKEN
);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -657,7 +656,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.TIMESTAMP);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -680,7 +679,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
// Negative test for no Timestamp
service.getInInterceptors().remove(inInterceptor);
- inProperties.put(WSHandlerConstants.ACTION, "");
+ inProperties.put(ConfigurationConstants.ACTION, "");
inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -702,7 +701,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.TIMESTAMP);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -723,7 +722,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
// Negative test for no Timestamp
service.getInInterceptors().remove(inInterceptor);
- inProperties.put(WSHandlerConstants.ACTION, "");
+ inProperties.put(ConfigurationConstants.ACTION, "");
inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -746,11 +745,11 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.TIMESTAMP
);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -791,11 +790,11 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.TIMESTAMP
);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -833,11 +832,11 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.TIMESTAMP
);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -882,9 +881,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "cxfca.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "cxfca.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -922,9 +921,9 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "cxfca.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "cxfca.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -956,12 +955,12 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPT
);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -999,12 +998,12 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPT
);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -1039,18 +1038,18 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- outProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- outProperties.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
- outProperties.put(WSHandlerConstants.USER, "myalias");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ outProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ outProperties.put(ConfigurationConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
+ outProperties.put(ConfigurationConstants.USER, "myalias");
WSS4JOutInterceptor domOhandler = new WSS4JOutInterceptor(outProperties);
service.getOutInterceptors().add(domOhandler);
@@ -1093,18 +1092,18 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- outProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- outProperties.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
- outProperties.put(WSHandlerConstants.USER, "myalias");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ outProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ outProperties.put(ConfigurationConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
+ outProperties.put(ConfigurationConstants.USER, "myalias");
WSS4JOutInterceptor domOhandler = new WSS4JOutInterceptor(outProperties);
service.getOutInterceptors().add(domOhandler);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
index 6322245..f2d987b 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
@@ -33,8 +33,8 @@ import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.CryptoFactory;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
@@ -53,9 +53,9 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -91,9 +91,9 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -129,9 +129,9 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -167,10 +167,10 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
- inProperties.put(WSHandlerConstants.IS_BSP_COMPLIANT, "false");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.IS_BSP_COMPLIANT, "false");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -206,10 +206,10 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
- inProperties.put(WSHandlerConstants.IS_BSP_COMPLIANT, "false");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.IS_BSP_COMPLIANT, "false");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
index 0335a48..a0242fd 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
@@ -35,8 +35,8 @@ import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.transport.local.LocalConduit;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.junit.Test;
@@ -63,9 +63,9 @@ public class UserNameTokenAuthorizationTest extends AbstractSecurityTest {
wsIn = new SimpleSubjectCreatingInterceptor();
wsIn.setSupportDigestPasswords(digest);
- wsIn.setProperty(WSHandlerConstants.SIG_PROP_FILE, "insecurity.properties");
- wsIn.setProperty(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
- wsIn.setProperty(WSHandlerConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
+ wsIn.setProperty(ConfigurationConstants.SIG_PROP_FILE, "insecurity.properties");
+ wsIn.setProperty(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
+ wsIn.setProperty(ConfigurationConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
service.getInInterceptors().add(wsIn);
@@ -75,23 +75,23 @@ public class UserNameTokenAuthorizationTest extends AbstractSecurityTest {
wsOut = new WSS4JOutInterceptor();
- wsOut.setProperty(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- wsOut.setProperty(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- wsOut.setProperty(WSHandlerConstants.USER, "myalias");
+ wsOut.setProperty(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ wsOut.setProperty(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ wsOut.setProperty(ConfigurationConstants.USER, "myalias");
if (digest) {
wsOut.setProperty("password", "myAliasPassword");
} else {
- wsOut.setProperty(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ wsOut.setProperty(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
}
if (encryptUsernameTokenOnly) {
- wsOut.setProperty(WSHandlerConstants.ENCRYPTION_USER, "myalias");
+ wsOut.setProperty(ConfigurationConstants.ENCRYPTION_USER, "myalias");
wsOut.setProperty(
- WSHandlerConstants.ENCRYPTION_PARTS,
+ ConfigurationConstants.ENCRYPTION_PARTS,
"{Content}{" + WSConstants.WSSE_NS + "}UsernameToken"
);
}
- wsOut.setProperty(WSHandlerConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
+ wsOut.setProperty(ConfigurationConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
service.getOutInterceptors().add(wsOut);
// Create the client
@@ -119,12 +119,12 @@ public class UserNameTokenAuthorizationTest extends AbstractSecurityTest {
@Test
public void testDigestPasswordAuthorized() throws Exception {
setUpService("developers", true, false);
- String actions = WSHandlerConstants.ENCRYPT + " " + WSHandlerConstants.SIGNATURE + " "
- + WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.USERNAME_TOKEN;
+ String actions = ConfigurationConstants.ENCRYPT + " " + ConfigurationConstants.SIGNATURE + " "
+ + ConfigurationConstants.TIMESTAMP + " " + ConfigurationConstants.USERNAME_TOKEN;
- wsIn.setProperty(WSHandlerConstants.ACTION, actions);
+ wsIn.setProperty(ConfigurationConstants.ACTION, actions);
- wsOut.setProperty(WSHandlerConstants.ACTION, actions);
+ wsOut.setProperty(ConfigurationConstants.ACTION, actions);
assertEquals("test", echo.echo("test"));
}
@@ -132,12 +132,12 @@ public class UserNameTokenAuthorizationTest extends AbstractSecurityTest {
@Test
public void testDigestPasswordUnauthorized() throws Exception {
setUpService("managers", true, false);
- String actions = WSHandlerConstants.ENCRYPT + " " + WSHandlerConstants.SIGNATURE + " "
- + WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.USERNAME_TOKEN;
+ String actions = ConfigurationConstants.ENCRYPT + " " + ConfigurationConstants.SIGNATURE + " "
+ + ConfigurationConstants.TIMESTAMP + " " + ConfigurationConstants.USERNAME_TOKEN;
- wsIn.setProperty(WSHandlerConstants.ACTION, actions);
+ wsIn.setProperty(ConfigurationConstants.ACTION, actions);
- wsOut.setProperty(WSHandlerConstants.ACTION, actions);
+ wsOut.setProperty(ConfigurationConstants.ACTION, actions);
try {
echo.echo("test");
@@ -150,10 +150,10 @@ public class UserNameTokenAuthorizationTest extends AbstractSecurityTest {
@Test
public void testEncryptedDigestPasswordAuthorized() throws Exception {
setUpService("developers", true, true);
- String actions = WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.ENCRYPT;
+ String actions = ConfigurationConstants.USERNAME_TOKEN + " " + ConfigurationConstants.ENCRYPT;
- wsIn.setProperty(WSHandlerConstants.ACTION, actions);
- wsOut.setProperty(WSHandlerConstants.ACTION, actions);
+ wsIn.setProperty(ConfigurationConstants.ACTION, actions);
+ wsOut.setProperty(ConfigurationConstants.ACTION, actions);
assertEquals("test", echo.echo("test"));
}
@@ -161,10 +161,10 @@ public class UserNameTokenAuthorizationTest extends AbstractSecurityTest {
@Test
public void testClearPasswordAuthorized() throws Exception {
setUpService("developers", false, false);
- String actions = WSHandlerConstants.USERNAME_TOKEN;
+ String actions = ConfigurationConstants.USERNAME_TOKEN;
- wsIn.setProperty(WSHandlerConstants.ACTION, actions);
- wsOut.setProperty(WSHandlerConstants.ACTION, actions);
+ wsIn.setProperty(ConfigurationConstants.ACTION, actions);
+ wsOut.setProperty(ConfigurationConstants.ACTION, actions);
assertEquals("test", echo.echo("test"));
}
@@ -172,10 +172,10 @@ public class UserNameTokenAuthorizationTest extends AbstractSecurityTest {
@Test
public void testEncyptedClearPasswordAuthorized() throws Exception {
setUpService("developers", false, true);
- String actions = WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.ENCRYPT;
+ String actions = ConfigurationConstants.USERNAME_TOKEN + " " + ConfigurationConstants.ENCRYPT;
- wsIn.setProperty(WSHandlerConstants.ACTION, actions);
- wsOut.setProperty(WSHandlerConstants.ACTION, actions);
+ wsIn.setProperty(ConfigurationConstants.ACTION, actions);
+ wsOut.setProperty(ConfigurationConstants.ACTION, actions);
assertEquals("test", echo.echo("test"));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
index a9d0ce3..68a0ea9 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
@@ -38,8 +38,8 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.junit.Test;
@@ -83,9 +83,9 @@ public class WSS4JFaultCodeTest extends AbstractSecurityTest {
ex.setInMessage(inmsg);
inmsg.setContent(SOAPMessage.class, saajMsg);
- inHandler.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inHandler.setProperty(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
- inHandler.setProperty(WSHandlerConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
+ inHandler.setProperty(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inHandler.setProperty(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
+ inHandler.setProperty(ConfigurationConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
inmsg.put(SecurityConstants.RETURN_SECURITY_ERROR, Boolean.TRUE);
@@ -112,8 +112,8 @@ public class WSS4JFaultCodeTest extends AbstractSecurityTest {
SoapMessage msg = getSoapMessageForDom(doc);
- msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.TIMESTAMP);
- msg.put(WSHandlerConstants.TTL_TIMESTAMP, "1");
+ msg.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
+ msg.put(ConfigurationConstants.TTL_TIMESTAMP, "1");
handler.handleMessage(msg);
@@ -143,8 +143,8 @@ public class WSS4JFaultCodeTest extends AbstractSecurityTest {
ex.setInMessage(inmsg);
inmsg.setContent(SOAPMessage.class, saajMsg);
- inHandler.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.TIMESTAMP);
- inHandler.setProperty(WSHandlerConstants.TTL_TIMESTAMP, "1");
+ inHandler.setProperty(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
+ inHandler.setProperty(ConfigurationConstants.TTL_TIMESTAMP, "1");
inmsg.put(SecurityConstants.RETURN_SECURITY_ERROR, Boolean.TRUE);
try {
@@ -173,7 +173,7 @@ public class WSS4JFaultCodeTest extends AbstractSecurityTest {
SoapMessage msg = getSoapMessageForDom(doc);
- msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.TIMESTAMP);
+ msg.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
handler.handleMessage(msg);
@@ -203,9 +203,9 @@ public class WSS4JFaultCodeTest extends AbstractSecurityTest {
ex.setInMessage(inmsg);
inmsg.setContent(SOAPMessage.class, saajMsg);
- inHandler.setProperty(WSHandlerConstants.ACTION,
- WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.USERNAME_TOKEN);
- inHandler.setProperty(WSHandlerConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
+ inHandler.setProperty(ConfigurationConstants.ACTION,
+ ConfigurationConstants.TIMESTAMP + " " + ConfigurationConstants.USERNAME_TOKEN);
+ inHandler.setProperty(ConfigurationConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
inmsg.put(SecurityConstants.RETURN_SECURITY_ERROR, Boolean.TRUE);
@@ -250,13 +250,13 @@ public class WSS4JFaultCodeTest extends AbstractSecurityTest {
ex.setInMessage(inmsg);
inmsg.setContent(SOAPMessage.class, saajMsg);
- inHandler.setProperty(WSHandlerConstants.ACTION,
- WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT);
- inHandler.setProperty(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
- inHandler.setProperty(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
- inHandler.setProperty(WSHandlerConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
+ inHandler.setProperty(ConfigurationConstants.ACTION,
+ ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPT);
+ inHandler.setProperty(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
+ inHandler.setProperty(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inHandler.setProperty(ConfigurationConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
inHandler.setProperty(
- WSHandlerConstants.PW_CALLBACK_CLASS,
+ ConfigurationConstants.PW_CALLBACK_CLASS,
"org.apache.cxf.ws.security.wss4j.TestPwdCallback"
);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
index aeb34e2..238c620 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
@@ -51,6 +51,7 @@ import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.principal.UsernameTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.WSDataRef;
@@ -88,14 +89,14 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
@Test
public void testSignature() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- outProperties.put(WSHandlerConstants.USER, "myalias");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ outProperties.put(ConfigurationConstants.USER, "myalias");
outProperties.put("password", "myAliasPassword");
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
List<String> xpaths = new ArrayList<>();
xpaths.add("//wsse:Security");
@@ -114,15 +115,15 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
@Test
public void testDirectReferenceSignature() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- outProperties.put(WSHandlerConstants.USER, "myalias");
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ outProperties.put(ConfigurationConstants.USER, "myalias");
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
outProperties.put("password", "myAliasPassword");
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
List<String> xpaths = new ArrayList<>();
xpaths.add("//wsse:Security");
@@ -142,15 +143,15 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
@Test
public void testEncryption() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- outProperties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- outProperties.put(WSHandlerConstants.USER, "myalias");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ outProperties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ outProperties.put(ConfigurationConstants.USER, "myalias");
outProperties.put("password", "myAliasPassword");
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
List<String> xpaths = new ArrayList<>();
xpaths.add("//wsse:Security");
@@ -191,25 +192,25 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
public void testEncryptedUsernameToken() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
outProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.ENCRYPT
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.USERNAME_TOKEN + " " + ConfigurationConstants.ENCRYPT
);
- outProperties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "alicePassword");
- outProperties.put(WSHandlerConstants.ENCRYPTION_USER, "myalias");
+ outProperties.put(ConfigurationConstants.ENCRYPTION_USER, "myalias");
outProperties.put(
- WSHandlerConstants.ENCRYPTION_PARTS,
+ ConfigurationConstants.ENCRYPTION_PARTS,
"{Content}{" + WSConstants.WSSE_NS + "}UsernameToken"
);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.ENCRYPT
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.USERNAME_TOKEN + " " + ConfigurationConstants.ENCRYPT
);
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
List<String> xpaths = new ArrayList<>();
xpaths.add("//wsse:Security");
@@ -242,15 +243,15 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
@Test
public void testUsernameToken() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- outProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ outProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "alicePassword");
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
List<String> xpaths = new ArrayList<>();
xpaths.add("//wsse:Security");
@@ -275,9 +276,9 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
SoapMessage msg = getSoapMessageForDom(doc);
- msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- msg.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- msg.put(WSHandlerConstants.USER, "myalias");
+ msg.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ msg.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ msg.put(ConfigurationConstants.USER, "myalias");
msg.put("password", "myAliasPassword");
handler.handleMessage(msg);
@@ -314,7 +315,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
ex.setInMessage(inmsg);
inmsg.setContent(SOAPMessage.class, saajMsg);
- inHandler.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.NO_SECURITY);
+ inHandler.setProperty(ConfigurationConstants.ACTION, WSHandlerConstants.NO_SECURITY);
inHandler.handleMessage(inmsg);
@@ -334,9 +335,9 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
SoapMessage msg = getSoapMessageForDom(doc);
- msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- msg.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- msg.put(WSHandlerConstants.USER, "myalias");
+ msg.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ msg.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ msg.put(ConfigurationConstants.USER, "myalias");
msg.put("password", "myAliasPassword");
handler.handleMessage(msg);
@@ -381,7 +382,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
ex.setInMessage(inmsg);
inmsg.setContent(SOAPMessage.class, saajMsg);
- inHandler.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
+ inHandler.setProperty(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
inHandler.handleMessage(inmsg);
@@ -399,16 +400,16 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
@Test
public void testPKIPath() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- outProperties.put(WSHandlerConstants.USER, "alice");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
- outProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USE_SINGLE_CERTIFICATE, "false");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ outProperties.put(ConfigurationConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USE_SINGLE_CERTIFICATE, "false");
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "cxfca.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "cxfca.properties");
List<String> xpaths = new ArrayList<>();
xpaths.add("//wsse:Security");
@@ -429,29 +430,29 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
public void testUsernameTokenSignature() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
outProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.SIGNATURE);
- outProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
- outProperties.put(WSHandlerConstants.USER, "alice");
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.USERNAME_TOKEN + " " + ConfigurationConstants.SIGNATURE);
+ outProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ outProperties.put(ConfigurationConstants.USER, "alice");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- outProperties.put(WSHandlerConstants.SIGNATURE_USER, "myalias");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ outProperties.put(ConfigurationConstants.SIGNATURE_USER, "myalias");
outProperties.put(
- WSHandlerConstants.PW_CALLBACK_CLASS,
+ ConfigurationConstants.PW_CALLBACK_CLASS,
"org.apache.cxf.ws.security.wss4j.TestPwdCallback"
);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.USERNAME_TOKEN + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
inProperties.put(
- WSHandlerConstants.PW_CALLBACK_CLASS,
+ ConfigurationConstants.PW_CALLBACK_CLASS,
"org.apache.cxf.ws.security.wss4j.TestPwdCallback"
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
List<String> xpaths = new ArrayList<>();
xpaths.add("//wsse:Security");
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
index 46339f8..d59438e 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
@@ -28,13 +28,13 @@ import org.w3c.dom.Document;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.phase.PhaseInterceptor;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.SecurityActionToken;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.action.UsernameTokenAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandler;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.junit.Test;
public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
@@ -47,11 +47,11 @@ public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor();
PhaseInterceptor<SoapMessage> handler = ohandler.createEndingInterceptor();
- msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- msg.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- msg.put(WSHandlerConstants.USER, "username");
+ msg.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ msg.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ msg.put(ConfigurationConstants.USER, "username");
msg.put("password", "myAliasPassword");
- msg.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ msg.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
handler.handleMessage(msg);
doc = msg.getContent(SOAPMessage.class).getSOAPPart();
@@ -70,11 +70,11 @@ public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor();
PhaseInterceptor<SoapMessage> handler = ohandler.createEndingInterceptor();
- msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- msg.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- msg.put(WSHandlerConstants.USER, "username");
+ msg.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ msg.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ msg.put(ConfigurationConstants.USER, "username");
msg.put("password", "myAliasPassword");
- msg.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
+ msg.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
handler.handleMessage(msg);
doc = msg.getContent(SOAPMessage.class).getSOAPPart();
@@ -93,10 +93,10 @@ public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor();
PhaseInterceptor<SoapMessage> handler = ohandler.createEndingInterceptor();
- msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- msg.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- msg.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- msg.put(WSHandlerConstants.USER, "myalias");
+ msg.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ msg.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ msg.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ msg.put(ConfigurationConstants.USER, "myalias");
msg.put("password", "myAliasPassword");
handler.handleMessage(msg);
@@ -114,9 +114,9 @@ public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor();
PhaseInterceptor<SoapMessage> handler = ohandler.createEndingInterceptor();
- msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- msg.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- msg.put(WSHandlerConstants.USER, "myAlias");
+ msg.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ msg.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ msg.put(ConfigurationConstants.USER, "myAlias");
msg.put("password", "myAliasPassword");
handler.handleMessage(msg);
@@ -134,9 +134,9 @@ public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor();
PhaseInterceptor<SoapMessage> handler = ohandler.createEndingInterceptor();
- ohandler.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.TIMESTAMP);
- ohandler.setProperty(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- msg.put(WSHandlerConstants.USER, "myalias");
+ ohandler.setProperty(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
+ ohandler.setProperty(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ msg.put(ConfigurationConstants.USER, "myalias");
msg.put("password", "myAliasPassword");
handler.handleMessage(msg);
@@ -158,11 +158,11 @@ public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
Map<Object, Object> customActions = new HashMap<>(1);
customActions.put(WSConstants.UT, action);
- msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- msg.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- msg.put(WSHandlerConstants.USER, "username");
+ msg.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ msg.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ msg.put(ConfigurationConstants.USER, "username");
msg.put("password", "myAliasPassword");
- msg.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ msg.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
msg.put(WSS4JOutInterceptor.WSS4J_ACTION_MAP, customActions);
handler.handleMessage(msg);
@@ -202,11 +202,11 @@ public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
Map<Object, Object> customActions = new HashMap<>(1);
customActions.put(12345, action);
- msg.put(WSHandlerConstants.ACTION, "12345");
- msg.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- msg.put(WSHandlerConstants.USER, "username");
+ msg.put(ConfigurationConstants.ACTION, "12345");
+ msg.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ msg.put(ConfigurationConstants.USER, "username");
msg.put("password", "myAliasPassword");
- msg.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ msg.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
msg.put(WSS4JOutInterceptor.WSS4J_ACTION_MAP, customActions);
handler.handleMessage(msg);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
index 2fba85e..3afb585 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
@@ -36,11 +36,11 @@ import org.apache.cxf.ws.security.wss4j.Echo;
import org.apache.cxf.ws.security.wss4j.EchoImpl;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
import org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.junit.Test;
@@ -68,9 +68,9 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
properties.put(
- WSHandlerConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler()
+ ConfigurationConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler()
);
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
@@ -99,13 +99,13 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
- properties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
+ properties.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
- properties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- properties.put(WSHandlerConstants.USER, "alice");
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new PasswordCallbackHandler());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ properties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ properties.put(ConfigurationConstants.USER, "alice");
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new PasswordCallbackHandler());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -131,9 +131,9 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
properties.put(
- WSHandlerConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler()
+ ConfigurationConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler()
);
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
@@ -162,13 +162,13 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
- properties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
+ properties.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
- properties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- properties.put(WSHandlerConstants.USER, "alice");
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new PasswordCallbackHandler());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ properties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ properties.put(ConfigurationConstants.USER, "alice");
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new PasswordCallbackHandler());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -201,16 +201,16 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
- properties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ properties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
- properties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- properties.put(WSHandlerConstants.USER, "alice");
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new PasswordCallbackHandler());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ properties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ properties.put(ConfigurationConstants.USER, "alice");
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new PasswordCallbackHandler());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -251,16 +251,16 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
- properties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ properties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
- properties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- properties.put(WSHandlerConstants.USER, "alice");
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new PasswordCallbackHandler());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ properties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ properties.put(ConfigurationConstants.USER, "alice");
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new PasswordCallbackHandler());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
[05/12] cxf git commit: Remove bunch of unnecessary casts and change
a bunch of calls to static methods to use the appropriate static class
Posted by dk...@apache.org.
Remove bunch of unnecessary casts and change a bunch of calls to static methods to use the appropriate static class
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ed5dfc98
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ed5dfc98
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ed5dfc98
Branch: refs/heads/master
Commit: ed5dfc9871a9d6717d76c7e1a7de1e2ceb050f2f
Parents: aaa00d1
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 14:01:33 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 14:02:07 2017 -0400
----------------------------------------------------------------------
.../ws/security/cache/CacheCleanupListener.java | 4 +-
.../security/tokenstore/EHCacheTokenStore.java | 2 +-
.../cxf/ws/security/trust/STSLoginModule.java | 6 +-
.../wss4j/PolicyBasedWSS4JInInterceptor.java | 8 +-
.../wss4j/UsernameTokenInterceptor.java | 2 +-
.../policyhandlers/AbstractBindingBuilder.java | 2 +-
.../AbstractStaxBindingHandler.java | 2 +-
.../StaxAsymmetricBindingHandler.java | 4 +-
.../StaxSymmetricBindingHandler.java | 4 +-
.../StaxTransportBindingHandler.java | 4 +-
.../RequiredPartsPolicyValidator.java | 2 +-
.../wss4j/AbstractPolicySecurityTest.java | 8 +-
.../cxf/sts/cache/HazelCastTokenStore.java | 6 +-
.../cxf/sts/claims/LdapClaimsHandler.java | 2 +-
.../org/apache/cxf/sts/claims/LdapUtils.java | 2 +-
.../apache/cxf/sts/event/map/EventMapper.java | 8 +-
.../apache/cxf/sts/request/RequestParser.java | 2 +-
.../sts/rest/RESTSecurityTokenServiceImpl.java | 2 +-
.../sts/token/provider/SymmetricKeyHandler.java | 8 +-
.../sts/token/renewer/SAMLTokenRenewerTest.java | 6 +-
.../AsymmetricEncryptionTest.java | 5 +-
.../sts/basic_auth/JaxwsBasicAuthTest.java | 9 +-
.../systest/sts/batch/SAMLBatchUnitTest.java | 5 +-
.../systest/sts/batch/SimpleBatchSTSClient.java | 2 +-
.../BinarySecurityTokenTest.java | 9 +-
.../cxf/systest/sts/caching/CachingTest.java | 13 +-
.../systest/sts/caching/ServerCachingTest.java | 13 +-
.../cxf/systest/sts/claims/ClaimsTest.java | 33 +--
.../sts/cross_domain/CrossDomainTest.java | 9 +-
.../systest/sts/custom/CustomParameterTest.java | 21 +-
.../custom_onbehalfof/CustomOnBehalfOfTest.java | 9 +-
.../DistributedCachingTest.java | 13 +-
.../apache/cxf/systest/sts/jwt/JWTUnitTest.java | 5 +-
.../cxf/systest/sts/jwt/JaxrsJWTTest.java | 5 +-
.../kerberos/KerberosDelegationTokenTest.java | 5 +-
.../systest/sts/realms/DifferentRealmTest.java | 17 +-
.../cxf/systest/sts/renew/SAMLRenewTest.java | 5 +-
.../systest/sts/renew/SAMLRenewUnitTest.java | 25 +--
.../sts/secure_conv/SecureConversationTest.java | 13 +-
.../SecurityContextTokenCancelTest.java | 5 +-
.../SecurityContextTokenUnitTest.java | 17 +-
.../cxf/systest/sts/soap12/Soap12Test.java | 9 +-
.../STSSenderVouchesTest.java | 5 +-
.../sts/transformation/TransformationTest.java | 9 +-
.../sts/usernametoken/UsernameTokenTest.java | 17 +-
.../sts/asymmetric/AsymmetricBindingTest.java | 17 +-
.../cxf/systest/sts/bearer/BearerTest.java | 9 +-
.../sts/delegation/SAMLDelegationTest.java | 17 +-
.../IntermediaryTransformationCachingTest.java | 5 +-
.../IntermediaryTransformationTest.java | 9 +-
.../cxf/systest/sts/issuer/IssuerTest.java | 13 +-
.../systest/sts/issueunit/IssueUnitTest.java | 37 ++--
.../apache/cxf/systest/sts/jaas/JAASTest.java | 33 +--
.../cxf/systest/sts/rest/STSRESTTest.java | 117 +++++------
.../sts/sendervouches/SenderVouchesTest.java | 5 +-
.../systest/sts/stsclient/STSClientTest.java | 9 +-
.../sts/symmetric/SymmetricBindingTest.java | 25 +--
.../cxf/systest/sts/template/TemplateTest.java | 25 +--
.../sts/transport/TransportBindingTest.java | 33 +--
.../UsernameActAsCachingTest.java | 17 +-
.../sts/username_actas/UsernameActAsTest.java | 5 +-
.../UsernameOnBehalfOfCachingTest.java | 17 +-
.../UsernameOnBehalfOfTest.java | 5 +-
.../sts/x509/X509AsymmetricBindingTest.java | 5 +-
.../sts/x509/X509SymmetricBindingTest.java | 21 +-
.../cxf/systest/ws/action/ActionTest.java | 49 ++---
.../ws/action/SignatureWhitespaceTest.java | 13 +-
.../systest/ws/algsuite/AlgorithmSuiteTest.java | 25 +--
.../ws/algsuite/StaxAlgorithmSuiteTest.java | 5 +-
.../cxf/systest/ws/basicauth/BasicAuthTest.java | 9 +-
.../ws/bindings/BindingPropertiesTest.java | 45 +++--
.../cxf/systest/ws/cache/CachingTest.java | 9 +-
.../CryptoCoverageCheckerTest.java | 57 +++---
.../apache/cxf/systest/ws/fault/FaultTest.java | 20 +-
.../systest/ws/fault/ModifiedRequestTest.java | 21 +-
.../org/apache/cxf/systest/ws/gcm/GCMTest.java | 21 +-
.../cxf/systest/ws/httpget/HTTPGetTest.java | 17 +-
.../cxf/systest/ws/https/HttpsTokenTest.java | 17 +-
.../cxf/systest/ws/mtom/MTOMSecurityTest.java | 33 +--
.../apache/cxf/systest/ws/parts/PartsTest.java | 45 +++--
.../ws/policy/PolicyAlternativeTest.java | 25 +--
.../ws/policy/UriDomainFactoryBeanListener.java | 2 +-
.../cxf/systest/ws/saml/SamlTokenTest.java | 101 +++++-----
.../saml/subjectconf/SamlSubjectConfTest.java | 33 +--
.../systest/ws/security/SecurityPolicyTest.java | 36 ++--
.../cxf/systest/ws/swa/SWAActionTest.java | 21 +-
.../cxf/systest/ws/swa/SWAPolicyTest.java | 29 +--
.../ws/tokens/BinarySecurityTokenTest.java | 5 +-
.../ws/tokens/EndorsingSupportingTokenTest.java | 9 +-
.../systest/ws/tokens/SupportingTokenTest.java | 17 +-
.../systest/ws/ut/UsernameTokenDerivedTest.java | 29 +--
.../systest/ws/ut/UsernameTokenPolicyTest.java | 21 +-
.../cxf/systest/ws/ut/UsernameTokenTest.java | 53 ++---
.../cxf/systest/ws/wssc/WSSCUnitTest.java | 21 +-
.../cxf/systest/ws/x509/X509TokenTest.java | 201 ++++++++++---------
.../apache/cxf/systest/ws/xkms/XKMSTest.java | 9 +-
96 files changed, 928 insertions(+), 856 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/CacheCleanupListener.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/CacheCleanupListener.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/CacheCleanupListener.java
index 1fbe882..4682904 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/CacheCleanupListener.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/CacheCleanupListener.java
@@ -59,11 +59,11 @@ public class CacheCleanupListener implements ServerLifeCycleListener, ClientLife
}
ReplayCache rc = (ReplayCache)info.getProperty(SecurityConstants.NONCE_CACHE_INSTANCE);
if (rc != null) {
- close((Closeable)rc);
+ close(rc);
}
rc = (ReplayCache)info.getProperty(SecurityConstants.TIMESTAMP_CACHE_INSTANCE);
if (rc != null) {
- close((Closeable)rc);
+ close(rc);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
index 0786732..435de10 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
@@ -141,7 +141,7 @@ public class EHCacheTokenStore implements TokenStore, Closeable, BusLifeCycleLis
private int getTTL() {
int parsedTTL = (int)ttl;
- if (ttl != (long)parsedTTL) {
+ if (ttl != parsedTTL) {
// Fall back to 60 minutes if the default TTL is set incorrectly
parsedTTL = 3600;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
index 194f68f..5357f35 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
@@ -284,8 +284,8 @@ public class STSLoginModule implements LoginModule {
URL busFile = Loader.getResource(cxfSpringCfg);
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
c = new STSClient(bus);
} else if (msg == null) {
Bus bus = BusFactory.getDefaultBus(true);
@@ -370,7 +370,7 @@ public class STSLoginModule implements LoginModule {
}
ClaimCollection claims =
- SAMLUtils.getClaims((SamlAssertionWrapper)samlAssertion);
+ SAMLUtils.getClaims(samlAssertion);
return SAMLUtils.parseRolesFromClaims(claims, roleAttributeName, null);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
index b4ecea8..1b83bcf 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
@@ -144,10 +144,10 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
if (encrCrypto != null) {
final String encCryptoRefId = "RefId-" + encrCrypto.hashCode();
message.put(WSHandlerConstants.SIG_VER_PROP_REF_ID, encCryptoRefId);
- message.put(encCryptoRefId, (Crypto)encrCrypto);
+ message.put(encCryptoRefId, encrCrypto);
} else if (signCrypto != null) {
message.put(WSHandlerConstants.SIG_VER_PROP_REF_ID, signCryptoRefId);
- message.put(signCryptoRefId, (Crypto)signCrypto);
+ message.put(signCryptoRefId, signCrypto);
}
return action;
@@ -184,10 +184,10 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
if (encrCrypto != null) {
final String encCryptoRefId = "RefId-" + encrCrypto.hashCode();
message.put(WSHandlerConstants.SIG_VER_PROP_REF_ID, encCryptoRefId);
- message.put(encCryptoRefId, (Crypto)encrCrypto);
+ message.put(encCryptoRefId, encrCrypto);
} else if (signCrypto != null) {
message.put(WSHandlerConstants.SIG_VER_PROP_REF_ID, signCryptoRefId);
- message.put(signCryptoRefId, (Crypto)signCrypto);
+ message.put(signCryptoRefId, signCrypto);
}
return action;
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
index b75d317..8a411d4 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
@@ -158,7 +158,7 @@ public class UsernameTokenInterceptor extends AbstractTokenInterceptor {
}
ClaimCollection claims =
- SAMLUtils.getClaims((SamlAssertionWrapper)samlAssertion);
+ SAMLUtils.getClaims(samlAssertion);
Set<Principal> roles =
SAMLUtils.parseRolesFromClaims(claims, roleAttributeName, null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 39e0042..833ebea 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -903,7 +903,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
if (o == null) {
SecurityToken securityToken = getSecurityToken();
if (securityToken != null) {
- Element tokenElement = (Element)securityToken.getToken();
+ Element tokenElement = securityToken.getToken();
String namespace = tokenElement.getNamespaceURI();
String localname = tokenElement.getLocalName();
SamlTokenType tokenType = token.getSamlTokenType();
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
index 47bc21b..ea22b1e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
@@ -656,7 +656,7 @@ public abstract class AbstractStaxBindingHandler extends AbstractCommonBindingHa
} */
} else if (token instanceof IssuedToken) {
SecurityToken sigTok = getSecurityToken();
- SecurePart securePart = addIssuedToken((IssuedToken)token, sigTok, signed, endorse);
+ SecurePart securePart = addIssuedToken(token, sigTok, signed, endorse);
if (securePart != null) {
ret.put(token, securePart);
if (suppTokens.isEncryptedToken()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
index 037a2cb..f138a1a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
@@ -130,7 +130,7 @@ public class StaxAsymmetricBindingHandler extends AbstractStaxBindingHandler {
AbstractToken initiatorToken = initiatorWrapper.getToken();
if (initiatorToken instanceof IssuedToken) {
SecurityToken sigTok = getSecurityToken();
- addIssuedToken((IssuedToken)initiatorToken, sigTok, false, true);
+ addIssuedToken(initiatorToken, sigTok, false, true);
if (sigTok != null) {
storeSecurityToken(initiatorToken, sigTok);
@@ -257,7 +257,7 @@ public class StaxAsymmetricBindingHandler extends AbstractStaxBindingHandler {
AbstractToken initiatorToken = initiatorWrapper.getToken();
if (initiatorToken instanceof IssuedToken) {
SecurityToken sigTok = getSecurityToken();
- addIssuedToken((IssuedToken)initiatorToken, sigTok, false, true);
+ addIssuedToken(initiatorToken, sigTok, false, true);
if (sigTok != null) {
storeSecurityToken(initiatorToken, sigTok);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
index 6c80607..df86a11 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
@@ -169,7 +169,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler {
}
} else if (encryptionToken instanceof IssuedToken) {
tok = getSecurityToken();
- addIssuedToken((IssuedToken)encryptionToken, tok, false, true);
+ addIssuedToken(encryptionToken, tok, false, true);
if (tok == null && !isRequestor()) {
org.apache.xml.security.stax.securityToken.SecurityToken securityToken =
@@ -295,7 +295,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler {
}
} else if (sigToken instanceof IssuedToken) {
sigTok = getSecurityToken();
- addIssuedToken((IssuedToken)sigToken, sigTok, false, true);
+ addIssuedToken(sigToken, sigTok, false, true);
if (sigTok == null && !isRequestor()) {
org.apache.xml.security.stax.securityToken.SecurityToken securityToken =
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java
index 812e5bf..ff71d2f 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java
@@ -108,7 +108,7 @@ public class StaxTransportBindingHandler extends AbstractStaxBindingHandler {
unassertPolicy(token.getToken(), "No transport token id");
return;
}
- addIssuedToken((IssuedToken)token.getToken(), secToken, false, false);
+ addIssuedToken(token.getToken(), secToken, false, false);
}
assertToken(token.getToken());
assertTokenWrapper(token);
@@ -222,7 +222,7 @@ public class StaxTransportBindingHandler extends AbstractStaxBindingHandler {
if (token instanceof UsernameToken) {
addUsernameToken((UsernameToken)token);
} else if (token instanceof IssuedToken) {
- addIssuedToken((IssuedToken)token, getSecurityToken(), false, false);
+ addIssuedToken(token, getSecurityToken(), false, false);
} else if (token instanceof KerberosToken) {
addKerberosToken((KerberosToken)token, false, false, false);
} else if (token instanceof SamlToken) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/RequiredPartsPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/RequiredPartsPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/RequiredPartsPolicyValidator.java
index f6fe386..e5407a4 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/RequiredPartsPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/RequiredPartsPolicyValidator.java
@@ -58,7 +58,7 @@ public class RequiredPartsPolicyValidator implements SecurityPolicyValidator {
ai.setAsserted(true);
for (Header h : rp.getHeaders()) {
QName qName = new QName(h.getNamespace(), h.getName());
- if (header == null || DOMUtils.getFirstChildWithName((Element)header, qName) == null) {
+ if (header == null || DOMUtils.getFirstChildWithName(header, qName) == null) {
ai.setNotAsserted("No header element of name " + qName + " found.");
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
index b0b677a..c3407f2 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
@@ -502,7 +502,7 @@ public abstract class AbstractPolicySecurityTest extends AbstractSecurityTest {
(NodeList) digestAlgoExpr.evaluate(signedDoc, XPathConstants.NODESET);
for (int i = 0; i < digestMethodNodes.getLength(); i++) {
- Node node = (Node)digestMethodNodes.item(i);
+ Node node = digestMethodNodes.item(i);
String digestAlgorithm = node.getAttributes().getNamedItem("Algorithm").getNodeValue();
assertEquals(expectedDigestAlgorithm, digestAlgorithm);
}
@@ -532,10 +532,10 @@ public abstract class AbstractPolicySecurityTest extends AbstractSecurityTest {
String strId = null;
for (int i = 0; i < strKeyIdNodes.getLength(); i++) {
- Node keyIdNode = (Node) strKeyIdNodes.item(i);
+ Node keyIdNode = strKeyIdNodes.item(i);
String strKey = keyIdNode.getTextContent();
if (strKey.equals(assertionId)) {
- Node strNode = (Node) keyIdNode.getParentNode();
+ Node strNode = keyIdNode.getParentNode();
strId = strNode.getAttributes().
getNamedItemNS(nsContext.getNamespaceURI("wsu"), "Id").getNodeValue();
break;
@@ -552,7 +552,7 @@ public abstract class AbstractPolicySecurityTest extends AbstractSecurityTest {
boolean foundStrReference = false;
for (int i = 0; i < sigReferenceNodes.getLength(); i++) {
- Node sigRefNode = (Node) sigReferenceNodes.item(i);
+ Node sigRefNode = sigReferenceNodes.item(i);
String sigRefURI = sigRefNode.getAttributes().getNamedItem("URI").getNodeValue();
if (sigRefURI.equals("#" + strId)) {
foundStrReference = true;
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java
index 28ab73a..ee85219 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java
@@ -135,10 +135,10 @@ public class HazelCastTokenStore implements TokenStore {
Duration duration = Duration.between(now, expires);
parsedTTL = (int)duration.getSeconds();
- if (duration.getSeconds() != (long)parsedTTL || parsedTTL > MAX_TTL) {
+ if (duration.getSeconds() != parsedTTL || parsedTTL > MAX_TTL) {
// Default to configured value
parsedTTL = (int)ttl;
- if (ttl != (long)parsedTTL) {
+ if (ttl != parsedTTL) {
// Fall back to 60 minutes if the default TTL is set incorrectly
parsedTTL = 3600;
}
@@ -146,7 +146,7 @@ public class HazelCastTokenStore implements TokenStore {
} else {
// Default to configured value
parsedTTL = (int)ttl;
- if (ttl != (long)parsedTTL) {
+ if (ttl != parsedTTL) {
// Fall back to 60 minutes if the default TTL is set incorrectly
parsedTTL = 3600;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
index c89df6c..2774d42 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
@@ -254,7 +254,7 @@ public class LdapClaimsHandler implements ClaimsHandler, RealmSupport {
c.setPrincipal(principal);
try {
- NamingEnumeration<?> list = (NamingEnumeration<?>)attr.getAll();
+ NamingEnumeration<?> list = attr.getAll();
while (list.hasMore()) {
Object obj = list.next();
if (obj instanceof String) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
index b453ae6..42a5f88 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
@@ -114,7 +114,7 @@ public final class LdapUtils {
public Object mapFromAttributes(Attributes attrs) throws NamingException {
NamingEnumeration<? extends Attribute> attrEnum = attrs.getAll();
while (attrEnum.hasMore()) {
- return (String) attrEnum.next().get();
+ return attrEnum.next().get();
}
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
index 1eb54ef..aeda39a 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
@@ -88,7 +88,7 @@ public class EventMapper implements STSEventListener {
(HttpServletRequest)params.getMessageContext().get(AbstractHTTPDestination.HTTP_REQUEST);
map.put(KEYS.REMOTE_HOST.name(), req.getRemoteHost());
map.put(KEYS.REMOTE_PORT.name(), String.valueOf(req.getRemotePort()));
- map.put(KEYS.URL.name(), (String)params.getMessageContext().get("org.apache.cxf.request.url"));
+ map.put(KEYS.URL.name(), params.getMessageContext().get("org.apache.cxf.request.url"));
} catch (Exception ex) {
map.put(KEYS.REMOTE_HOST.name(), "N.A.");
map.put(KEYS.REMOTE_PORT.name(), "N.A.");
@@ -136,7 +136,7 @@ public class EventMapper implements STSEventListener {
(HttpServletRequest)params.getMessageContext().get(AbstractHTTPDestination.HTTP_REQUEST);
map.put(KEYS.REMOTE_HOST.name(), req.getRemoteHost());
map.put(KEYS.REMOTE_PORT.name(), String.valueOf(req.getRemotePort()));
- map.put(KEYS.URL.name(), (String)params.getMessageContext().get("org.apache.cxf.request.url"));
+ map.put(KEYS.URL.name(), params.getMessageContext().get("org.apache.cxf.request.url"));
map.put(KEYS.TOKENTYPE.name(), params.getTokenRequirements().getTokenType());
if (params.getTokenRequirements().getActAs() != null) {
map.put(KEYS.VALIDATE_PRINCIPAL.name(), params.getTokenRequirements().getValidateTarget().getPrincipal()
@@ -157,7 +157,7 @@ public class EventMapper implements STSEventListener {
(HttpServletRequest)params.getMessageContext().get(AbstractHTTPDestination.HTTP_REQUEST);
map.put(KEYS.REMOTE_HOST.name(), req.getRemoteHost());
map.put(KEYS.REMOTE_PORT.name(), String.valueOf(req.getRemotePort()));
- map.put(KEYS.URL.name(), (String)params.getMessageContext().get("org.apache.cxf.request.url"));
+ map.put(KEYS.URL.name(), params.getMessageContext().get("org.apache.cxf.request.url"));
map.put(KEYS.TOKENTYPE.name(), params.getTokenRequirements().getTokenType());
if (params.getTokenRequirements().getActAs() != null) {
map.put(KEYS.CANCEL_PRINCIPAL.name(), params.getTokenRequirements().getCancelTarget().getPrincipal()
@@ -177,7 +177,7 @@ public class EventMapper implements STSEventListener {
(HttpServletRequest)params.getMessageContext().get(AbstractHTTPDestination.HTTP_REQUEST);
map.put(KEYS.REMOTE_HOST.name(), req.getRemoteHost());
map.put(KEYS.REMOTE_PORT.name(), String.valueOf(req.getRemotePort()));
- map.put(KEYS.URL.name(), (String)params.getMessageContext().get("org.apache.cxf.request.url"));
+ map.put(KEYS.URL.name(), params.getMessageContext().get("org.apache.cxf.request.url"));
map.put(KEYS.TOKENTYPE.name(), params.getTokenRequirements().getTokenType());
if (params.getTokenRequirements().getRenewTarget() != null) {
map.put(KEYS.RENEW_PRINCIPAL.name(), params.getTokenRequirements().getRenewTarget().getPrincipal()
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
index 960b9b7..b53c95f 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
@@ -151,7 +151,7 @@ public class RequestParser {
tokenRequirements.setAppliesTo(element);
LOG.fine("Found AppliesTo element");
} else if (allowCustomContent) {
- tokenRequirements.addCustomContent((Element)requestObject);
+ tokenRequirements.addCustomContent(requestObject);
} else {
LOG.log(
Level.WARNING,
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
index b9c0030..627f5f9 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
@@ -380,7 +380,7 @@ public class RESTSecurityTokenServiceImpl extends SecurityTokenServiceImpl imple
private X509Certificate getTLSClientCertificate() {
TLSSessionInfo tlsInfo =
- (TLSSessionInfo)PhaseInterceptorChain.getCurrentMessage().get(TLSSessionInfo.class);
+ PhaseInterceptorChain.getCurrentMessage().get(TLSSessionInfo.class);
if (tlsInfo != null && tlsInfo.getPeerCertificates() != null
&& tlsInfo.getPeerCertificates().length > 0
&& (tlsInfo.getPeerCertificates()[0] instanceof X509Certificate)
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java
index 9d4ef04..4c5d8a3 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java
@@ -109,8 +109,8 @@ public class SymmetricKeyHandler {
} else if (STSConstants.SYMMETRIC_KEY_TYPE.equals(binarySecret.getBinarySecretType())
|| binarySecret.getBinarySecretType() == null) {
byte[] secretValue = binarySecret.getBinarySecretValue();
- if (((long)secretValue.length * 8L) < signatureProperties.getMinimumKeySize()
- || ((long)secretValue.length * 8L) > signatureProperties.getMaximumKeySize()) {
+ if ((secretValue.length * 8L) < signatureProperties.getMinimumKeySize()
+ || (secretValue.length * 8L) > signatureProperties.getMaximumKeySize()) {
LOG.log(
Level.WARNING, "Received secret of length " + secretValue.length
+ " bits is not accepted"
@@ -128,8 +128,8 @@ public class SymmetricKeyHandler {
}
} else if (clientEntropy.getDecryptedKey() != null) {
byte[] secretValue = clientEntropy.getDecryptedKey();
- if (((long)secretValue.length * 8L) < signatureProperties.getMinimumKeySize()
- || ((long)secretValue.length * 8L) > signatureProperties.getMaximumKeySize()) {
+ if ((secretValue.length * 8L) < signatureProperties.getMinimumKeySize()
+ || (secretValue.length * 8L) > signatureProperties.getMaximumKeySize()) {
LOG.log(
Level.WARNING, "Received secret of length " + secretValue.length
+ " bits is not accepted"
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
index 77b772b..1500e89 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
@@ -123,7 +123,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
assertTrue(renewerResponse.getToken() != null);
String oldId = new SamlAssertionWrapper(samlToken).getId();
- String newId = new SamlAssertionWrapper((Element)renewerResponse.getToken()).getId();
+ String newId = new SamlAssertionWrapper(renewerResponse.getToken()).getId();
assertFalse(oldId.equals(newId));
// Now validate it again
@@ -264,7 +264,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
assertTrue(renewerResponse.getToken() != null);
String oldId = new SamlAssertionWrapper(samlToken).getId();
- String newId = new SamlAssertionWrapper((Element)renewerResponse.getToken()).getId();
+ String newId = new SamlAssertionWrapper(renewerResponse.getToken()).getId();
assertFalse(oldId.equals(newId));
// Now validate it again
@@ -340,7 +340,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert {
assertTrue(renewerResponse.getToken() != null);
String oldId = new SamlAssertionWrapper(samlToken).getId();
- String newId = new SamlAssertionWrapper((Element)renewerResponse.getToken()).getId();
+ String newId = new SamlAssertionWrapper(renewerResponse.getToken()).getId();
assertFalse(oldId.equals(newId));
// Now validate it again
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
index 0eef807..be22d01 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
@@ -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.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -90,8 +91,8 @@ public class AsymmetricEncryptionTest extends AbstractBusClientServerTestBase {
URL busFile = SecurityContextTokenUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
SecurityToken token = requestSecurityToken(bus, test.getStsPort());
assertTrue(token != null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
index d109850..096c2b1 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
@@ -26,6 +26,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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -111,8 +112,8 @@ public class JaxwsBasicAuthTest extends AbstractBusClientServerTestBase {
URL busFile = JaxwsBasicAuthTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = JaxwsBasicAuthTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -138,8 +139,8 @@ public class JaxwsBasicAuthTest extends AbstractBusClientServerTestBase {
URL busFile = JaxwsBasicAuthTest.class.getResource("cxf-bad-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = JaxwsBasicAuthTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
index acae8fe..6636851 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
@@ -27,6 +27,7 @@ import java.util.List;
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.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -92,8 +93,8 @@ public class SAMLBatchUnitTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLBatchUnitTest.class.getResource("cxf-client-unit.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + test.getStsPort() + "/SecurityTokenService/Transport?wsdl";
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
index 8cfcf8a..d4da6a8 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
@@ -617,7 +617,7 @@ public class SimpleBatchSTSClient implements Configurable, InterceptorProvider {
while (child != null) {
if (child instanceof Element
&& "RequestSecurityTokenResponse".equals(((Element)child).getLocalName())) {
- Element rstrChild = DOMUtils.getFirstElement((Element)child);
+ Element rstrChild = DOMUtils.getFirstElement(child);
while (rstrChild != null) {
if ("Status".equals(rstrChild.getLocalName())) {
Element e2 =
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
index ddbddf3..4fe4515 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
@@ -26,6 +26,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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -111,8 +112,8 @@ public class BinarySecurityTokenTest extends AbstractBusClientServerTestBase {
URL busFile = BinarySecurityTokenTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BinarySecurityTokenTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -138,8 +139,8 @@ public class BinarySecurityTokenTest extends AbstractBusClientServerTestBase {
URL busFile = BinarySecurityTokenTest.class.getResource("cxf-bad-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BinarySecurityTokenTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
index 2449094..79bd61d 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
@@ -28,6 +28,7 @@ import javax.xml.ws.soap.SOAPFaultException;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Endpoint;
@@ -86,8 +87,8 @@ public class CachingTest extends AbstractBusClientServerTestBase {
URL busFile = CachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -131,8 +132,8 @@ public class CachingTest extends AbstractBusClientServerTestBase {
URL busFile = CachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -173,8 +174,8 @@ public class CachingTest extends AbstractBusClientServerTestBase {
URL busFile = CachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java
index 0bf1302..017d41c 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java
@@ -29,6 +29,7 @@ import javax.xml.ws.Service;
import org.w3c.dom.Element;
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.endpoint.Endpoint;
@@ -95,8 +96,8 @@ public class ServerCachingTest extends AbstractBusClientServerTestBase {
URL busFile = ServerCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ServerCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -147,8 +148,8 @@ public class ServerCachingTest extends AbstractBusClientServerTestBase {
URL busFile = ServerCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ServerCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -186,8 +187,8 @@ public class ServerCachingTest extends AbstractBusClientServerTestBase {
URL busFile = ServerCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ServerCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
index 22fa75e..f3b1af4 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
@@ -27,6 +27,7 @@ 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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -119,8 +120,8 @@ public class ClaimsTest extends AbstractBusClientServerTestBase {
URL busFile = ClaimsTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ClaimsTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -148,8 +149,8 @@ public class ClaimsTest extends AbstractBusClientServerTestBase {
URL busFile = ClaimsTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ClaimsTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -178,8 +179,8 @@ public class ClaimsTest extends AbstractBusClientServerTestBase {
URL busFile = ClaimsTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ClaimsTest.class.getResource("DoubleItWrongClaims.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -213,8 +214,8 @@ public class ClaimsTest extends AbstractBusClientServerTestBase {
URL busFile = ClaimsTest.class.getResource("cxf-bad-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ClaimsTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -248,8 +249,8 @@ public class ClaimsTest extends AbstractBusClientServerTestBase {
URL busFile = ClaimsTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ClaimsTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -278,8 +279,8 @@ public class ClaimsTest extends AbstractBusClientServerTestBase {
URL busFile = ClaimsTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ClaimsTest.class.getResource("DoubleItWrongClaims.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -316,8 +317,8 @@ public class ClaimsTest extends AbstractBusClientServerTestBase {
URL busFile = ClaimsTest.class.getResource("cxf-client-cbhandler.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ClaimsTest.class.getResource("DoubleItNoClaims.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -346,8 +347,8 @@ public class ClaimsTest extends AbstractBusClientServerTestBase {
URL busFile = ClaimsTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = ClaimsTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
index 09c656e..4f68a23 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
@@ -26,6 +26,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.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -101,8 +102,8 @@ public class CrossDomainTest extends AbstractBusClientServerTestBase {
URL busFile = CrossDomainTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CrossDomainTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -133,8 +134,8 @@ public class CrossDomainTest extends AbstractBusClientServerTestBase {
URL busFile = CrossDomainTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CrossDomainTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
index 96122ba..9859460 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
@@ -34,6 +34,7 @@ import javax.xml.ws.Service;
import org.w3c.dom.Element;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.rt.security.SecurityConstants;
@@ -104,8 +105,8 @@ public class CustomParameterTest extends AbstractBusClientServerTestBase {
URL busFile = CustomParameterTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CustomParameterTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -149,8 +150,8 @@ public class CustomParameterTest extends AbstractBusClientServerTestBase {
URL busFile = CustomParameterTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CustomParameterTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -199,8 +200,8 @@ public class CustomParameterTest extends AbstractBusClientServerTestBase {
URL busFile = CustomParameterTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CustomParameterTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -244,8 +245,8 @@ public class CustomParameterTest extends AbstractBusClientServerTestBase {
URL busFile = CustomParameterTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CustomParameterTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -293,8 +294,8 @@ public class CustomParameterTest extends AbstractBusClientServerTestBase {
URL busFile = CustomParameterTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenServiceREST/token";
WebClient client = WebClient.create(address, busFile.toString());
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
index d1c43d4..2d3546d 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
@@ -25,6 +25,7 @@ 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.rt.security.SecurityConstants;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
@@ -80,8 +81,8 @@ public class CustomOnBehalfOfTest extends AbstractBusClientServerTestBase {
URL busFile = CustomOnBehalfOfTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CustomOnBehalfOfTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -106,8 +107,8 @@ public class CustomOnBehalfOfTest extends AbstractBusClientServerTestBase {
URL busFile = CustomOnBehalfOfTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = CustomOnBehalfOfTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
index d76ae46..a5717c8 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
@@ -24,6 +24,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.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -85,8 +86,8 @@ public class DistributedCachingTest extends AbstractBusClientServerTestBase {
URL busFile = DistributedCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = DistributedCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -108,8 +109,8 @@ public class DistributedCachingTest extends AbstractBusClientServerTestBase {
URL busFile = DistributedCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = DistributedCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -131,8 +132,8 @@ public class DistributedCachingTest extends AbstractBusClientServerTestBase {
URL busFile = DistributedCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = DistributedCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
index 89965a4..2a6718a 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
@@ -23,6 +23,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.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.deployment.STSServer;
@@ -64,8 +65,8 @@ public class JWTUnitTest extends AbstractBusClientServerTestBase {
URL busFile = JWTUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
// Issue the token
SecurityToken token =
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
index e833ebc..bc234e5 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.core.HttpHeaders;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.message.Message;
@@ -85,8 +86,8 @@ public class JaxrsJWTTest extends AbstractBusClientServerTestBase {
URL busFile = JaxrsJWTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
final String address = "https://localhost:" + PORT + "/doubleit/services/doubleit-rs";
final int numToDouble = 25;
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
index f0b2883..d301e24 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
@@ -26,6 +26,7 @@ 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.jaxrs.client.WebClient;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
@@ -92,8 +93,8 @@ public class KerberosDelegationTokenTest extends AbstractBusClientServerTestBase
URL busFile = KerberosDelegationTokenTest.class.getResource("cxf-intermediary-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = KerberosDelegationTokenTest.class.getResource("DoubleItIntermediary.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
index 422da0c..e987866 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
@@ -24,6 +24,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.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -83,8 +84,8 @@ public class DifferentRealmTest extends AbstractBusClientServerTestBase {
URL busFile = DifferentRealmTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = DifferentRealmTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -111,8 +112,8 @@ public class DifferentRealmTest extends AbstractBusClientServerTestBase {
URL busFile = DifferentRealmTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = DifferentRealmTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -138,8 +139,8 @@ public class DifferentRealmTest extends AbstractBusClientServerTestBase {
URL busFile = DifferentRealmTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = DifferentRealmTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -171,8 +172,8 @@ public class DifferentRealmTest extends AbstractBusClientServerTestBase {
URL busFile = DifferentRealmTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = DifferentRealmTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
index f1c836c..8c89252 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
@@ -25,6 +25,7 @@ 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.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -79,8 +80,8 @@ public class SAMLRenewTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLRenewTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SAMLRenewTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
index 9057545..5f46498 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
@@ -26,6 +26,7 @@ import java.util.List;
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.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -89,8 +90,8 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLRenewUnitTest.class.getResource("cxf-client-unit.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + test.getStsPort() + "/SecurityTokenService/Transport?wsdl";
@@ -126,8 +127,8 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLRenewUnitTest.class.getResource("cxf-client-unit.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + test.getStsPort() + "/SecurityTokenService/Transport?wsdl";
@@ -163,8 +164,8 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLRenewUnitTest.class.getResource("cxf-client-unit.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + test.getStsPort() + "/SecurityTokenService/Transport?wsdl";
@@ -193,8 +194,8 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLRenewUnitTest.class.getResource("cxf-client-unit.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + test.getStsPort() + "/SecurityTokenService/Transport?wsdl";
@@ -225,8 +226,8 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLRenewUnitTest.class.getResource("cxf-client-unit.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + test.getStsPort() + "/SecurityTokenService/Transport?wsdl";
@@ -256,8 +257,8 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLRenewUnitTest.class.getResource("cxf-client-unit.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + test.getStsPort() + "/SecurityTokenService/Transport?wsdl";
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
index 53519a8..a96ae8f 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
@@ -24,6 +24,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.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -74,8 +75,8 @@ public class SecureConversationTest extends AbstractBusClientServerTestBase {
URL busFile = SecureConversationTest.class.getResource("cxf-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("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -95,8 +96,8 @@ public class SecureConversationTest extends AbstractBusClientServerTestBase {
URL busFile = SecureConversationTest.class.getResource("cxf-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("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -116,8 +117,8 @@ public class SecureConversationTest extends AbstractBusClientServerTestBase {
URL busFile = SecureConversationTest.class.getResource("cxf-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("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
index 58cebf8..acfc85e 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
@@ -23,6 +23,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.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -64,8 +65,8 @@ public class SecurityContextTokenCancelTest extends AbstractBusClientServerTestB
URL busFile = SecurityContextTokenCancelTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + STSPORT + "/SecurityTokenService/TransportSCT?wsdl";
[04/12] cxf git commit: Remove bunch of unnecessary casts and change
a bunch of calls to static methods to use the appropriate static class
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
index 642258c..6dd611d 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
@@ -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.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -87,8 +88,8 @@ public class SecurityContextTokenUnitTest extends AbstractBusClientServerTestBas
URL busFile = SecurityContextTokenUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + test.getStsPort() + "/SecurityTokenService/TransportSCT?wsdl";
@@ -105,8 +106,8 @@ public class SecurityContextTokenUnitTest extends AbstractBusClientServerTestBas
URL busFile = SecurityContextTokenUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + test.getStsPort() + "/SecurityTokenService/TransportSCT?wsdl";
@@ -123,8 +124,8 @@ public class SecurityContextTokenUnitTest extends AbstractBusClientServerTestBas
URL busFile = SecurityContextTokenUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + test.getStsPort() + "/SecurityTokenService/TransportSCTEncrypted?wsdl";
@@ -141,8 +142,8 @@ public class SecurityContextTokenUnitTest extends AbstractBusClientServerTestBas
URL busFile = SecurityContextTokenUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String wsdlLocation =
"https://localhost:" + test.getStsPort() + "/SecurityTokenService/TransportSCTEncrypted?wsdl";
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
index aeee6c2..0677e66 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
@@ -30,6 +30,7 @@ import javax.xml.ws.Service;
import org.w3c.dom.Element;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
@@ -131,8 +132,8 @@ public class Soap12Test extends AbstractBusClientServerTestBase {
URL busFile = Soap12Test.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = Soap12Test.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -163,8 +164,8 @@ public class Soap12Test extends AbstractBusClientServerTestBase {
URL busFile = Soap12Test.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
try {
String badAddress =
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
index c5cbd74..0dc54d5 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
@@ -27,6 +27,7 @@ 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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -100,8 +101,8 @@ public class STSSenderVouchesTest extends AbstractBusClientServerTestBase {
URL busFile = STSSenderVouchesTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = STSSenderVouchesTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
index 8b52b56..38c7827 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
@@ -24,6 +24,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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.deployment.STSServer;
@@ -79,8 +80,8 @@ public class TransformationTest extends AbstractBusClientServerTestBase {
URL busFile = TransformationTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TransformationTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -102,8 +103,8 @@ public class TransformationTest extends AbstractBusClientServerTestBase {
URL busFile = TransformationTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TransformationTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
index aa8294c..f1707f3 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
@@ -26,6 +26,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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -113,8 +114,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenTest.class.getResource("cxf-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("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -140,8 +141,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenTest.class.getResource("cxf-bad-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("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -176,8 +177,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenTest.class.getResource("cxf-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("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -207,8 +208,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenTest.class.getResource("cxf-bad-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("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
index a89c15b..397fe57 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
@@ -28,6 +28,7 @@ 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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -128,8 +129,8 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = AsymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = AsymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -157,8 +158,8 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = AsymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = AsymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -187,8 +188,8 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = AsymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = AsymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -217,8 +218,8 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = AsymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = AsymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
index b3de3ea..9b127a8 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
@@ -27,6 +27,7 @@ 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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -113,8 +114,8 @@ public class BearerTest extends AbstractBusClientServerTestBase {
URL busFile = BearerTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BearerTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -142,8 +143,8 @@ public class BearerTest extends AbstractBusClientServerTestBase {
URL busFile = BearerTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BearerTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
index cdc3a2e..3797bf2 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
@@ -27,6 +27,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Element;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
@@ -92,8 +93,8 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLDelegationTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
// Get a token from the UT endpoint first
SecurityToken token =
@@ -129,8 +130,8 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLDelegationTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
// Get a token from the UT endpoint first
SecurityToken token =
@@ -166,8 +167,8 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLDelegationTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
CallbackHandler callbackHandler = new CommonCallbackHandler();
@@ -202,8 +203,8 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
URL busFile = SAMLDelegationTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
// Create SAML token
Element samlToken =
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
index b42f3f7..b103512 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
@@ -26,6 +26,7 @@ import javax.xml.ws.Service;
import javax.xml.ws.soap.SOAPFaultException;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TokenTestUtils;
@@ -87,8 +88,8 @@ public class IntermediaryTransformationCachingTest extends AbstractBusClientServ
URL busFile = IntermediaryTransformationCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = IntermediaryTransformationCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
index 9e393b4..40cc753 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
@@ -25,6 +25,7 @@ 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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TokenTestUtils;
@@ -86,8 +87,8 @@ public class IntermediaryTransformationTest extends AbstractBusClientServerTestB
URL busFile = IntermediaryTransformationTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = IntermediaryTransformationTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -112,8 +113,8 @@ public class IntermediaryTransformationTest extends AbstractBusClientServerTestB
URL busFile = IntermediaryTransformationTest.class.getResource("cxf-bad-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = IntermediaryTransformationTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
index 0f9efeb..3cdf8d5 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
@@ -26,6 +26,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.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -90,8 +91,8 @@ public class IssuerTest extends AbstractBusClientServerTestBase {
URL busFile = IssuerTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = IssuerTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -118,8 +119,8 @@ public class IssuerTest extends AbstractBusClientServerTestBase {
URL busFile = IssuerTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = IssuerTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -146,8 +147,8 @@ public class IssuerTest extends AbstractBusClientServerTestBase {
URL busFile = IssuerTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = IssuerTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index 630bb43..c19396f 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -30,6 +30,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.soap.SoapBindingConstants;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.helpers.DOMUtils;
@@ -112,8 +113,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
URL busFile = IssueUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
// Get Metadata
JaxWsProxyFactoryBean proxyFac = new JaxWsProxyFactoryBean();
@@ -143,8 +144,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
URL busFile = IssueUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
// Get a token
SecurityToken token =
@@ -184,8 +185,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
URL busFile = IssueUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
// Get a token
SecurityToken token =
@@ -224,8 +225,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
URL busFile = IssueUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
// Get a token
SecurityToken token =
@@ -261,8 +262,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
URL busFile = IssueUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
// Get a token
SecurityToken token =
@@ -300,8 +301,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
URL busFile = IssueUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
try {
requestSecurityToken(SAML1_TOKEN_TYPE, BEARER_KEYTYPE, bus, null);
@@ -322,8 +323,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
URL busFile = IssueUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
// Get a token
String context = "AuthenticationContext";
@@ -360,8 +361,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
URL busFile = IssueUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
// Get a token
SecurityToken token =
@@ -394,8 +395,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
URL busFile = IssueUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
CallbackHandler callbackHandler = new CommonCallbackHandler();
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
index 04562b7..d274219 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
@@ -26,6 +26,7 @@ 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.jaxrs.client.WebClient;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
@@ -87,8 +88,8 @@ public class JAASTest extends AbstractBusClientServerTestBase {
URL busFile = JAASTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -118,8 +119,8 @@ public class JAASTest extends AbstractBusClientServerTestBase {
URL busFile = JAASTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -149,8 +150,8 @@ public class JAASTest extends AbstractBusClientServerTestBase {
URL busFile = JAASTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -182,8 +183,8 @@ public class JAASTest extends AbstractBusClientServerTestBase {
URL busFile = JAASTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -215,8 +216,8 @@ public class JAASTest extends AbstractBusClientServerTestBase {
URL busFile = JAASTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -246,8 +247,8 @@ public class JAASTest extends AbstractBusClientServerTestBase {
URL busFile = JAASTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -279,8 +280,8 @@ public class JAASTest extends AbstractBusClientServerTestBase {
URL busFile = JAASTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -315,8 +316,8 @@ public class JAASTest extends AbstractBusClientServerTestBase {
URL busFile = JAASTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
index b7d3177..59ad1a9 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
@@ -40,6 +40,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.common.util.CompressionUtils;
@@ -116,8 +117,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -148,8 +149,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -180,8 +181,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -222,8 +223,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -264,8 +265,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -306,8 +307,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -348,8 +349,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -388,8 +389,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -428,8 +429,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -461,8 +462,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -488,8 +489,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -550,8 +551,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -575,8 +576,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -615,8 +616,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -656,8 +657,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -697,8 +698,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -768,8 +769,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -837,8 +838,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -874,8 +875,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -896,8 +897,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -919,8 +920,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -962,8 +963,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -1008,8 +1009,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -1087,8 +1088,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -1162,8 +1163,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -1185,8 +1186,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -1203,8 +1204,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -1224,8 +1225,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
@@ -1245,8 +1246,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
String address = "https://localhost:" + STSPORT + "/SecurityTokenService/token";
WebClient client = WebClient.create(address, busFile.toString());
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
index 5dfc6b7..40a43da 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
@@ -26,6 +26,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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -109,8 +110,8 @@ public class SenderVouchesTest extends AbstractBusClientServerTestBase {
URL busFile = SenderVouchesTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SenderVouchesTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
index facfbc4..92d4c14 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
@@ -24,6 +24,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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.deployment.STSServer;
@@ -70,8 +71,8 @@ public class STSClientTest extends AbstractBusClientServerTestBase {
URL busFile = STSClientTest.class.getResource("cxf-client-name.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = STSClientTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -93,8 +94,8 @@ public class STSClientTest extends AbstractBusClientServerTestBase {
URL busFile = STSClientTest.class.getResource("cxf-default-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = STSClientTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
index 44e136d..f7bc2d4 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
@@ -38,6 +38,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
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.jaxws.DispatchImpl;
@@ -139,8 +140,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -169,8 +170,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -198,8 +199,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -227,8 +228,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -256,8 +257,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -297,8 +298,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
index b8dd073..50ed170 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
@@ -29,6 +29,7 @@ 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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -104,8 +105,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase {
URL busFile = TemplateTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TemplateTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -140,8 +141,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase {
URL busFile = TemplateTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TemplateTest.class.getResource("DoubleItNoTemplate.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -183,8 +184,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase {
URL busFile = TemplateTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TemplateTest.class.getResource("DoubleItNoTemplate2.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -227,8 +228,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase {
URL busFile = TemplateTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TemplateTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -263,8 +264,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase {
URL busFile = TemplateTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TemplateTest.class.getResource("DoubleItNoTemplate.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -306,8 +307,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase {
URL busFile = TemplateTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TemplateTest.class.getResource("DoubleItNoTemplate2.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index fe42d38..7e0110b 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -37,6 +37,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
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.jaxws.DispatchImpl;
@@ -129,8 +130,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
URL busFile = TransportBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -158,8 +159,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
URL busFile = TransportBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -193,8 +194,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
URL busFile = TransportBindingTest.class.getResource("cxf-bad-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -227,8 +228,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
URL busFile = TransportBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -261,8 +262,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
URL busFile = TransportBindingTest.class.getResource("cxf-bad-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -300,8 +301,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
URL busFile = TransportBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -347,8 +348,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
URL busFile = TransportBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -395,8 +396,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
URL busFile = TransportBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
index cc496d7..5fd6ad6 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
@@ -26,6 +26,7 @@ import javax.xml.ws.Service;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
@@ -86,8 +87,8 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameActAsCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameActAsCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -172,8 +173,8 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameActAsCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameActAsCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -262,8 +263,8 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameActAsCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameActAsCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -353,8 +354,8 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameActAsCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameActAsCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
index 6caf9b4..d24b394 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
@@ -27,6 +27,7 @@ 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.rt.security.SecurityConstants;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
@@ -107,8 +108,8 @@ public class UsernameActAsTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameActAsTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameActAsTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
index 583dbe7..d520dc7 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
@@ -26,6 +26,7 @@ import javax.xml.ws.Service;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
@@ -85,8 +86,8 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
URL busFile = UsernameOnBehalfOfCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameOnBehalfOfCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -172,8 +173,8 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
URL busFile = UsernameOnBehalfOfCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameOnBehalfOfCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -262,8 +263,8 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
URL busFile = UsernameOnBehalfOfCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameOnBehalfOfCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -353,8 +354,8 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
URL busFile = UsernameOnBehalfOfCachingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameOnBehalfOfCachingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
index d7874e4..3be8271 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
@@ -27,6 +27,7 @@ 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.rt.security.SecurityConstants;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
@@ -106,8 +107,8 @@ public class UsernameOnBehalfOfTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameOnBehalfOfTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameOnBehalfOfTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
index 8bc26ad..2911967 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
@@ -25,6 +25,7 @@ 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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TokenTestUtils;
@@ -75,8 +76,8 @@ public class X509AsymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = X509AsymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = X509AsymmetricBindingTest.class.getResource("DoubleItAsymmetric.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
index 93df546..ea8f52d 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
@@ -27,6 +27,7 @@ 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.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
@@ -115,8 +116,8 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = X509SymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = X509SymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -144,8 +145,8 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = X509SymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = X509SymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -174,8 +175,8 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = X509SymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = X509SymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -206,8 +207,8 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = X509SymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = X509SymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -242,8 +243,8 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase {
URL busFile = X509SymmetricBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = X509SymmetricBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
[11/12] cxf git commit: Fix static references to appropraite class
Posted by dk...@apache.org.
Fix static references to appropraite class
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a5dd7fa0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a5dd7fa0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a5dd7fa0
Branch: refs/heads/master
Commit: a5dd7fa02b73852f250c8d87b10c7fc1a6e1f4a6
Parents: 903ef61
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 14:32:13 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 14:32:13 2017 -0400
----------------------------------------------------------------------
.../wss4j/AbstractWSS4JInterceptor.java | 15 +-
.../wss4j/PolicyBasedWSS4JInInterceptor.java | 32 +--
.../wss4j/PolicyBasedWSS4JOutInterceptor.java | 4 +-
.../ws/security/wss4j/WSS4JInInterceptor.java | 13 +-
.../ws/security/wss4j/WSS4JOutInterceptor.java | 13 +-
.../security/wss4j/WSS4JStaxInInterceptor.java | 7 +-
.../policyhandlers/AbstractBindingBuilder.java | 3 +-
.../wss4j/AbstractPolicySecurityTest.java | 15 +-
.../wss4j/CryptoCoverageCheckerTest.java | 16 +-
.../DOMToStaxEncryptionIdentifierTest.java | 52 ++---
.../security/wss4j/DOMToStaxRoundTripTest.java | 136 ++++++-------
.../wss4j/DOMToStaxSignatureIdentifierTest.java | 52 ++---
.../wss4j/DefaultCryptoCoverageCheckerTest.java | 14 +-
.../cxf/ws/security/wss4j/RoundTripTest.java | 36 ++--
.../security/wss4j/SecurityActionTokenTest.java | 13 +-
.../wss4j/SignatureConfirmationTest.java | 19 +-
.../StaxToDOMEncryptionIdentifierTest.java | 34 ++--
.../security/wss4j/StaxToDOMRoundTripTest.java | 201 +++++++++----------
.../wss4j/StaxToDOMSignatureIdentifierTest.java | 36 ++--
.../wss4j/UserNameTokenAuthorizationTest.java | 56 +++---
.../ws/security/wss4j/WSS4JFaultCodeTest.java | 36 ++--
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 123 ++++++------
.../security/wss4j/WSS4JOutInterceptorTest.java | 54 ++---
.../security/wss4j/saml/DOMToStaxSamlTest.java | 58 +++---
.../ws/security/wss4j/saml/SamlTokenTest.java | 119 +++++------
.../security/wss4j/saml/StaxToDOMSamlTest.java | 57 +++---
26 files changed, 610 insertions(+), 604 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
index ffcb0bc..0d57a9a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
@@ -42,7 +42,6 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandler;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
public abstract class AbstractWSS4JInterceptor extends WSHandler implements SoapInterceptor,
PhaseInterceptor<SoapMessage> {
@@ -150,34 +149,34 @@ public abstract class AbstractWSS4JInterceptor extends WSHandler implements Soap
protected void translateProperties(SoapMessage msg) {
String bspCompliant = (String)msg.getContextualProperty(SecurityConstants.IS_BSP_COMPLIANT);
if (bspCompliant != null) {
- msg.put(WSHandlerConstants.IS_BSP_COMPLIANT, bspCompliant);
+ msg.put(ConfigurationConstants.IS_BSP_COMPLIANT, bspCompliant);
}
String futureTTL =
(String)msg.getContextualProperty(SecurityConstants.TIMESTAMP_FUTURE_TTL);
if (futureTTL != null) {
- msg.put(WSHandlerConstants.TTL_FUTURE_TIMESTAMP, futureTTL);
+ msg.put(ConfigurationConstants.TTL_FUTURE_TIMESTAMP, futureTTL);
}
String ttl =
(String)msg.getContextualProperty(SecurityConstants.TIMESTAMP_TTL);
if (ttl != null) {
- msg.put(WSHandlerConstants.TTL_TIMESTAMP, ttl);
+ msg.put(ConfigurationConstants.TTL_TIMESTAMP, ttl);
}
String utFutureTTL =
(String)msg.getContextualProperty(SecurityConstants.USERNAMETOKEN_FUTURE_TTL);
if (utFutureTTL != null) {
- msg.put(WSHandlerConstants.TTL_FUTURE_USERNAMETOKEN, utFutureTTL);
+ msg.put(ConfigurationConstants.TTL_FUTURE_USERNAMETOKEN, utFutureTTL);
}
String utTTL =
(String)msg.getContextualProperty(SecurityConstants.USERNAMETOKEN_TTL);
if (utTTL != null) {
- msg.put(WSHandlerConstants.TTL_USERNAMETOKEN, utTTL);
+ msg.put(ConfigurationConstants.TTL_USERNAMETOKEN, utTTL);
}
String certConstraints =
(String)SecurityUtils.getSecurityPropertyValue(SecurityConstants.SUBJECT_CERT_CONSTRAINTS, msg);
if (certConstraints != null) {
- msg.put(WSHandlerConstants.SIG_SUBJECT_CERT_CONSTRAINTS, certConstraints);
+ msg.put(ConfigurationConstants.SIG_SUBJECT_CERT_CONSTRAINTS, certConstraints);
}
// Now set SAML SenderVouches + Holder Of Key requirements
@@ -189,7 +188,7 @@ public abstract class AbstractWSS4JInterceptor extends WSHandler implements Soap
validateSAMLSubjectConf = Boolean.parseBoolean(valSAMLSubjectConf);
}
msg.put(
- WSHandlerConstants.VALIDATE_SAML_SUBJECT_CONFIRMATION,
+ ConfigurationConstants.VALIDATE_SAML_SUBJECT_CONFIRMATION,
Boolean.toString(validateSAMLSubjectConf)
);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
index 1b83bcf..34c5faa 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
@@ -42,6 +42,7 @@ import org.apache.cxf.ws.security.policy.PolicyUtils;
import org.apache.cxf.ws.security.wss4j.policyvalidators.PolicyValidatorParameters;
import org.apache.cxf.ws.security.wss4j.policyvalidators.SecurityPolicyValidator;
import org.apache.cxf.ws.security.wss4j.policyvalidators.ValidatorUtils;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.PasswordEncryptor;
import org.apache.wss4j.common.ext.WSSecurityException;
@@ -49,7 +50,6 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.WSDataRef;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.message.token.Timestamp;
import org.apache.wss4j.policy.SP12Constants;
@@ -82,14 +82,14 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
private void handleWSS11(AssertionInfoMap aim, SoapMessage message) {
if (isRequestor(message)) {
- message.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "false");
+ message.put(ConfigurationConstants.ENABLE_SIGNATURE_CONFIRMATION, "false");
Collection<AssertionInfo> ais =
PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.WSS11);
if (!ais.isEmpty()) {
for (AssertionInfo ai : ais) {
Wss11 wss11 = (Wss11)ai.getAssertion();
if (wss11.isRequireSignatureConfirmation()) {
- message.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
+ message.put(ConfigurationConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
break;
}
}
@@ -137,16 +137,16 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
final String signCryptoRefId = signCrypto != null ? "RefId-" + signCrypto.hashCode() : null;
if (signCrypto != null) {
- message.put(WSHandlerConstants.DEC_PROP_REF_ID, signCryptoRefId);
+ message.put(ConfigurationConstants.DEC_PROP_REF_ID, signCryptoRefId);
message.put(signCryptoRefId, signCrypto);
}
if (encrCrypto != null) {
final String encCryptoRefId = "RefId-" + encrCrypto.hashCode();
- message.put(WSHandlerConstants.SIG_VER_PROP_REF_ID, encCryptoRefId);
+ message.put(ConfigurationConstants.SIG_VER_PROP_REF_ID, encCryptoRefId);
message.put(encCryptoRefId, encrCrypto);
} else if (signCrypto != null) {
- message.put(WSHandlerConstants.SIG_VER_PROP_REF_ID, signCryptoRefId);
+ message.put(ConfigurationConstants.SIG_VER_PROP_REF_ID, signCryptoRefId);
message.put(signCryptoRefId, signCrypto);
}
@@ -177,16 +177,16 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
final String signCryptoRefId = signCrypto != null ? "RefId-" + signCrypto.hashCode() : null;
if (signCrypto != null) {
- message.put(WSHandlerConstants.DEC_PROP_REF_ID, signCryptoRefId);
+ message.put(ConfigurationConstants.DEC_PROP_REF_ID, signCryptoRefId);
message.put(signCryptoRefId, signCrypto);
}
if (encrCrypto != null) {
final String encCryptoRefId = "RefId-" + encrCrypto.hashCode();
- message.put(WSHandlerConstants.SIG_VER_PROP_REF_ID, encCryptoRefId);
+ message.put(ConfigurationConstants.SIG_VER_PROP_REF_ID, encCryptoRefId);
message.put(encCryptoRefId, encrCrypto);
} else if (signCrypto != null) {
- message.put(WSHandlerConstants.SIG_VER_PROP_REF_ID, signCryptoRefId);
+ message.put(ConfigurationConstants.SIG_VER_PROP_REF_ID, signCryptoRefId);
message.put(signCryptoRefId, signCrypto);
}
@@ -251,7 +251,7 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
for (AssertionInfo ai : ais) {
UsernameToken policy = (UsernameToken)ai.getAssertion();
if (policy.getPasswordType() == PasswordType.NoPassword) {
- message.put(WSHandlerConstants.ALLOW_USERNAMETOKEN_NOPASSWORD, "true");
+ message.put(ConfigurationConstants.ALLOW_USERNAMETOKEN_NOPASSWORD, "true");
}
}
}
@@ -291,7 +291,7 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
}
if (crypto != null) {
final String refId = "RefId-" + crypto.hashCode();
- message.put(WSHandlerConstants.SIG_VER_PROP_REF_ID, refId);
+ message.put(ConfigurationConstants.SIG_VER_PROP_REF_ID, refId);
message.put(refId, crypto);
}
@@ -301,7 +301,7 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
}
if (crypto != null) {
final String refId = "RefId-" + crypto.hashCode();
- message.put(WSHandlerConstants.DEC_PROP_REF_ID, refId);
+ message.put(ConfigurationConstants.DEC_PROP_REF_ID, refId);
message.put(refId, crypto);
}
} else {
@@ -311,7 +311,7 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
}
if (crypto != null) {
final String refId = "RefId-" + crypto.hashCode();
- message.put(WSHandlerConstants.SIG_VER_PROP_REF_ID, refId);
+ message.put(ConfigurationConstants.SIG_VER_PROP_REF_ID, refId);
message.put(refId, crypto);
}
@@ -321,7 +321,7 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
}
if (crypto != null) {
final String refId = "RefId-" + crypto.hashCode();
- message.put(WSHandlerConstants.DEC_PROP_REF_ID, refId);
+ message.put(ConfigurationConstants.DEC_PROP_REF_ID, refId);
message.put(refId, crypto);
}
}
@@ -383,7 +383,7 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
}
protected void computeAction(SoapMessage message, RequestData data) throws WSSecurityException {
- String action = getString(WSHandlerConstants.ACTION, message);
+ String action = getString(ConfigurationConstants.ACTION, message);
if (action == null) {
action = "";
}
@@ -472,7 +472,7 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
}
}
- message.put(WSHandlerConstants.ACTION, action.trim());
+ message.put(ConfigurationConstants.ACTION, action.trim());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
index dc35ded..f167c59 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
@@ -46,10 +46,10 @@ import org.apache.cxf.ws.security.wss4j.policyhandlers.AsymmetricBindingHandler;
import org.apache.cxf.ws.security.wss4j.policyhandlers.SymmetricBindingHandler;
import org.apache.cxf.ws.security.wss4j.policyhandlers.TransportBindingHandler;
import org.apache.neethi.Policy;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.ThreadLocalSecurityProvider;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.engine.WSSConfig;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.policy.model.AbstractBinding;
import org.apache.wss4j.policy.model.AsymmetricBinding;
@@ -225,7 +225,7 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa
private void translateProperties(SoapMessage msg) {
String bspCompliant = (String)msg.getContextualProperty(SecurityConstants.IS_BSP_COMPLIANT);
if (bspCompliant != null) {
- msg.put(WSHandlerConstants.IS_BSP_COMPLIANT, bspCompliant);
+ msg.put(ConfigurationConstants.IS_BSP_COMPLIANT, bspCompliant);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
index 6fdd656..5272bd5 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
@@ -62,6 +62,7 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.tokenstore.TokenStoreUtils;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.cache.ReplayCache;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.ThreadLocalSecurityProvider;
@@ -231,7 +232,7 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
List<Integer> actions = WSSecurityUtil.decodeAction(action);
- String actor = (String)getOption(WSHandlerConstants.ACTOR);
+ String actor = (String)getOption(ConfigurationConstants.ACTOR);
if (actor == null) {
actor = (String)msg.getContextualProperty(SecurityConstants.ACTOR);
}
@@ -254,8 +255,8 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
// Only search for and expand (Signed) XOP Elements if MTOM is enabled (and not
// explicitly specified by the user)
- if (getString(WSHandlerConstants.EXPAND_XOP_INCLUDE_FOR_SIGNATURE, msg) == null
- && getString(WSHandlerConstants.EXPAND_XOP_INCLUDE, msg) == null) {
+ if (getString(ConfigurationConstants.EXPAND_XOP_INCLUDE_FOR_SIGNATURE, msg) == null
+ && getString(ConfigurationConstants.EXPAND_XOP_INCLUDE, msg) == null) {
reqData.setExpandXopInclude(AttachmentUtil.isMtomEnabled(msg));
}
@@ -437,7 +438,7 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
// Now check to see if SIGNATURE_PARTS are specified
String signatureParts =
- (String)getProperty(msg, WSHandlerConstants.SIGNATURE_PARTS);
+ (String)getProperty(msg, ConfigurationConstants.SIGNATURE_PARTS);
if (signatureParts != null) {
String warning = "To enforce that particular elements were signed you must either "
+ "use WS-SecurityPolicy, or else use the CryptoCoverageChecker or "
@@ -572,9 +573,9 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
}
private String getAction(SoapMessage msg, SoapVersion version) {
- String action = (String)getOption(WSHandlerConstants.ACTION);
+ String action = (String)getOption(ConfigurationConstants.ACTION);
if (action == null) {
- action = (String)msg.get(WSHandlerConstants.ACTION);
+ action = (String)msg.get(ConfigurationConstants.ACTION);
}
if (action == null) {
LOG.warning("No security action was defined!");
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
index 6856e37..ee10d88 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
@@ -41,6 +41,7 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptor;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.ThreadLocalSecurityProvider;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.WSConstants;
@@ -178,7 +179,7 @@ public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor {
CastUtils.cast((List<?>)getProperty(mc, WSHandlerConstants.HANDLER_ACTIONS));
if (actions == null) {
// If null then just fall back to the "action" String
- String action = getString(WSHandlerConstants.ACTION, mc);
+ String action = getString(ConfigurationConstants.ACTION, mc);
if (action == null) {
throw new SoapFault(new Message("NO_ACTION", LOG), version
.getReceiver());
@@ -195,10 +196,10 @@ public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor {
reqData.setAttachmentCallbackHandler(new AttachmentCallbackHandler(mc));
// Enable XOP Include unless the user has explicitly configured it
- if (getString(WSHandlerConstants.EXPAND_XOP_INCLUDE, mc) == null) {
+ if (getString(ConfigurationConstants.EXPAND_XOP_INCLUDE, mc) == null) {
reqData.setExpandXopInclude(AttachmentUtil.isMtomEnabled(mc));
}
- if (getString(WSHandlerConstants.STORE_BYTES_IN_ATTACHMENT, mc) == null) {
+ if (getString(ConfigurationConstants.STORE_BYTES_IN_ATTACHMENT, mc) == null) {
reqData.setStoreBytesInAttachment(AttachmentUtil.isMtomEnabled(mc));
}
@@ -206,10 +207,10 @@ public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor {
* For every action we need a username, so get this now. The
* username defined in the deployment descriptor takes precedence.
*/
- reqData.setUsername((String) getOption(WSHandlerConstants.USER));
+ reqData.setUsername((String) getOption(ConfigurationConstants.USER));
if (reqData.getUsername() == null || reqData.getUsername().equals("")) {
String username = (String) getProperty(reqData.getMsgContext(),
- WSHandlerConstants.USER);
+ ConfigurationConstants.USER);
if (username != null) {
reqData.setUsername(username);
}
@@ -229,7 +230,7 @@ public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor {
}
}
if (userNameRequired && (reqData.getUsername() == null || reqData.getUsername().equals(""))
- && (String)getOption(WSHandlerConstants.SIGNATURE_USER) == null) {
+ && (String)getOption(ConfigurationConstants.SIGNATURE_USER) == null) {
throw new SoapFault(new Message("NO_USERNAME", LOG), version
.getReceiver());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
index 774f6ba..b2e3614 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.util.StreamReaderDelegate;
@@ -413,9 +414,9 @@ public class WSS4JStaxInInterceptor extends AbstractWSS4JStaxInterceptor {
XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class);
try {
int i = xmlReader.getEventType();
- while (i == XMLStreamReader.NAMESPACE
- || i == XMLStreamReader.ATTRIBUTE
- || i == XMLStreamReader.CHARACTERS) {
+ while (i == XMLStreamConstants.NAMESPACE
+ || i == XMLStreamConstants.ATTRIBUTE
+ || i == XMLStreamConstants.CHARACTERS) {
i = xmlReader.next();
}
} catch (XMLStreamException e) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 833ebea..7879025 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -81,6 +81,7 @@ import org.apache.cxf.ws.security.wss4j.CXFCallbackLookup;
import org.apache.cxf.ws.security.wss4j.WSS4JUtils;
import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.neethi.Assertion;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.WSEncryptionPart;
import org.apache.wss4j.common.bsp.BSPEnforcer;
import org.apache.wss4j.common.crypto.Crypto;
@@ -1660,7 +1661,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
if (encrUser == null || "".equals(encrUser)) {
unassertPolicy(token, "A " + (sign ? "signature" : "encryption") + " username needs to be declared.");
}
- if (WSHandlerConstants.USE_REQ_SIG_CERT.equals(encrUser)) {
+ if (ConfigurationConstants.USE_REQ_SIG_CERT.equals(encrUser)) {
List<WSHandlerResult> results =
CastUtils.cast((List<?>)
message.getExchange().getInMessage().get(WSHandlerConstants.RECV_RESULTS));
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
index c3407f2..82597de 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
@@ -64,6 +64,7 @@ import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JOutInterceptor.PolicyBasedWSS4JOutInterceptorInternal;
import org.apache.neethi.Policy;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
@@ -376,23 +377,23 @@ public abstract class AbstractPolicySecurityTest extends AbstractSecurityTest {
for (CoverageType type : types) {
switch(type) {
case SIGNED:
- action += " " + WSHandlerConstants.SIGNATURE;
+ action += " " + ConfigurationConstants.SIGNATURE;
break;
case ENCRYPTED:
- action += " " + WSHandlerConstants.ENCRYPT;
+ action += " " + ConfigurationConstants.ENCRYPT;
break;
default:
fail("Unsupported coverage type.");
}
}
- inHandler.setProperty(WSHandlerConstants.ACTION, action);
- inHandler.setProperty(WSHandlerConstants.SIG_VER_PROP_FILE,
+ inHandler.setProperty(ConfigurationConstants.ACTION, action);
+ inHandler.setProperty(ConfigurationConstants.SIG_VER_PROP_FILE,
"insecurity.properties");
- inHandler.setProperty(WSHandlerConstants.DEC_PROP_FILE,
+ inHandler.setProperty(ConfigurationConstants.DEC_PROP_FILE,
"insecurity.properties");
- inHandler.setProperty(WSHandlerConstants.PW_CALLBACK_CLASS,
+ inHandler.setProperty(ConfigurationConstants.PW_CALLBACK_CLASS,
TestPwdCallback.class.getName());
- inHandler.setProperty(WSHandlerConstants.IS_BSP_COMPLIANT, "false");
+ inHandler.setProperty(ConfigurationConstants.IS_BSP_COMPLIANT, "false");
return inHandler;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
index 283be4a..475e73a 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
@@ -40,7 +40,7 @@ import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageChecker.XPathExpression;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.junit.Test;
@@ -235,17 +235,17 @@ public class CryptoCoverageCheckerTest extends AbstractSecurityTest {
private PhaseInterceptor<SoapMessage> getWss4jInInterceptor() {
final WSS4JInInterceptor inHandler = new WSS4JInInterceptor(true);
- final String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ final String action = ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPT;
- inHandler.setProperty(WSHandlerConstants.ACTION, action);
- inHandler.setProperty(WSHandlerConstants.SIG_VER_PROP_FILE,
+ inHandler.setProperty(ConfigurationConstants.ACTION, action);
+ inHandler.setProperty(ConfigurationConstants.SIG_VER_PROP_FILE,
"insecurity.properties");
- inHandler.setProperty(WSHandlerConstants.DEC_PROP_FILE,
+ inHandler.setProperty(ConfigurationConstants.DEC_PROP_FILE,
"insecurity.properties");
- inHandler.setProperty(WSHandlerConstants.PW_CALLBACK_CLASS,
+ inHandler.setProperty(ConfigurationConstants.PW_CALLBACK_CLASS,
TestPwdCallback.class.getName());
- inHandler.setProperty(WSHandlerConstants.IS_BSP_COMPLIANT, "false");
- inHandler.setProperty(WSHandlerConstants.ALLOW_RSA15_KEY_TRANSPORT_ALGORITHM, "true");
+ inHandler.setProperty(ConfigurationConstants.IS_BSP_COMPLIANT, "false");
+ inHandler.setProperty(ConfigurationConstants.ALLOW_RSA15_KEY_TRANSPORT_ALGORITHM, "true");
return inHandler;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
index 553bb50..096f9c4 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
@@ -31,8 +31,8 @@ import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.CryptoFactory;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.junit.Test;
@@ -64,11 +64,11 @@ public class DOMToStaxEncryptionIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
- properties.put(WSHandlerConstants.ENC_KEY_ID, "DirectReference");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.ENC_KEY_ID, "DirectReference");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -97,11 +97,11 @@ public class DOMToStaxEncryptionIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
- properties.put(WSHandlerConstants.ENC_KEY_ID, "IssuerSerial");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.ENC_KEY_ID, "IssuerSerial");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -130,11 +130,11 @@ public class DOMToStaxEncryptionIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
- properties.put(WSHandlerConstants.ENC_KEY_ID, "Thumbprint");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.ENC_KEY_ID, "Thumbprint");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -163,11 +163,11 @@ public class DOMToStaxEncryptionIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
- properties.put(WSHandlerConstants.ENC_KEY_ID, "X509KeyIdentifier");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.ENC_KEY_ID, "X509KeyIdentifier");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -196,11 +196,11 @@ public class DOMToStaxEncryptionIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
- properties.put(WSHandlerConstants.ENC_KEY_ID, "EncryptedKeySHA1");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.ENC_KEY_ID, "EncryptedKeySHA1");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
index 547526e..2828c63 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
@@ -34,9 +34,9 @@ import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.junit.Test;
@@ -66,10 +66,10 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- properties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.USER, "username");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ properties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.USER, "username");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -114,10 +114,10 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
- properties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.USER, "username");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
+ properties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.USER, "username");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -163,10 +163,10 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -195,12 +195,12 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
- properties.put(WSHandlerConstants.ENC_KEY_TRANSPORT, WSConstants.KEYTRANSPORT_RSA15);
- properties.put(WSHandlerConstants.ENC_SYM_ALGO, WSConstants.TRIPLE_DES);
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.ENC_KEY_TRANSPORT, WSConstants.KEYTRANSPORT_RSA15);
+ properties.put(ConfigurationConstants.ENC_SYM_ALGO, WSConstants.TRIPLE_DES);
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -241,13 +241,13 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
Map<String, Object> properties = new HashMap<>();
properties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.ENCRYPT
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.USERNAME_TOKEN + " " + ConfigurationConstants.ENCRYPT
);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "username");
- properties.put(WSHandlerConstants.ENCRYPTION_USER, "myalias");
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "username");
+ properties.put(ConfigurationConstants.ENCRYPTION_USER, "myalias");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -276,10 +276,10 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -309,12 +309,12 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
Map<String, Object> properties = new HashMap<>();
properties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.USERNAME_TOKEN
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.USERNAME_TOKEN
);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -340,7 +340,7 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.TIMESTAMP);
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -370,17 +370,17 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
Map<String, Object> properties = new HashMap<>();
properties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.TIMESTAMP + " " + ConfigurationConstants.SIGNATURE
);
properties.put(
- WSHandlerConstants.SIGNATURE_PARTS,
+ ConfigurationConstants.SIGNATURE_PARTS,
"{}{" + WSSConstants.NS_WSU10 + "}Timestamp;"
+ "{}{" + WSSConstants.NS_SOAP11 + "}Body;"
);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -410,17 +410,17 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
Map<String, Object> properties = new HashMap<>();
properties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.TIMESTAMP + " " + ConfigurationConstants.SIGNATURE
);
properties.put(
- WSHandlerConstants.SIGNATURE_PARTS,
+ ConfigurationConstants.SIGNATURE_PARTS,
"{}{" + WSSConstants.NS_WSSE10 + "}Timestamp;"
+ "{}{" + WSSConstants.NS_SOAP11 + "}Body;"
);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -454,12 +454,12 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
- properties.put(WSHandlerConstants.USER, "alice");
- properties.put(WSHandlerConstants.USE_SINGLE_CERTIFICATE, "true");
- properties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
+ properties.put(ConfigurationConstants.USER, "alice");
+ properties.put(ConfigurationConstants.USE_SINGLE_CERTIFICATE, "true");
+ properties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -490,13 +490,13 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
Map<String, Object> properties = new HashMap<>();
properties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPT
);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -539,20 +539,20 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
- properties.put(WSHandlerConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
+ properties.put(ConfigurationConstants.USER, "myalias");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
Map<String, Object> domInProperties = new HashMap<>();
- domInProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- domInProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- domInProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
- domInProperties.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
+ domInProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ domInProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ domInProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ domInProperties.put(ConfigurationConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(domInProperties);
client.getInInterceptors().add(inInterceptor);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
index 9038858..0b59b2b 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
@@ -31,9 +31,9 @@ import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.crypto.CryptoFactory;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.junit.Test;
@@ -65,11 +65,11 @@ public class DOMToStaxSignatureIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
- properties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -98,11 +98,11 @@ public class DOMToStaxSignatureIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
- properties.put(WSHandlerConstants.SIG_KEY_ID, "IssuerSerial");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.SIG_KEY_ID, "IssuerSerial");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -131,11 +131,11 @@ public class DOMToStaxSignatureIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
- properties.put(WSHandlerConstants.SIG_KEY_ID, "Thumbprint");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.SIG_KEY_ID, "Thumbprint");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -164,11 +164,11 @@ public class DOMToStaxSignatureIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
- properties.put(WSHandlerConstants.SIG_KEY_ID, "X509KeyIdentifier");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.SIG_KEY_ID, "X509KeyIdentifier");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
@@ -198,11 +198,11 @@ public class DOMToStaxSignatureIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
Map<String, Object> properties = new HashMap<>();
- properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- properties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- properties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- properties.put(WSHandlerConstants.USER, "myalias");
- properties.put(WSHandlerConstants.SIG_KEY_ID, "KeyValue");
+ properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ properties.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ properties.put(ConfigurationConstants.USER, "myalias");
+ properties.put(ConfigurationConstants.SIG_KEY_ID, "KeyValue");
WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties);
client.getOutInterceptors().add(ohandler);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java
index b58747e..c88395a 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java
@@ -32,7 +32,7 @@ import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageChecker.XPathExpression;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.junit.Test;
/**
@@ -122,16 +122,16 @@ public class DefaultCryptoCoverageCheckerTest extends AbstractSecurityTest {
private PhaseInterceptor<SoapMessage> getWss4jInInterceptor() {
final WSS4JInInterceptor inHandler = new WSS4JInInterceptor(true);
- final String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ final String action = ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPT;
- inHandler.setProperty(WSHandlerConstants.ACTION, action);
- inHandler.setProperty(WSHandlerConstants.SIG_VER_PROP_FILE,
+ inHandler.setProperty(ConfigurationConstants.ACTION, action);
+ inHandler.setProperty(ConfigurationConstants.SIG_VER_PROP_FILE,
"insecurity.properties");
- inHandler.setProperty(WSHandlerConstants.DEC_PROP_FILE,
+ inHandler.setProperty(ConfigurationConstants.DEC_PROP_FILE,
"insecurity.properties");
- inHandler.setProperty(WSHandlerConstants.PW_CALLBACK_CLASS,
+ inHandler.setProperty(ConfigurationConstants.PW_CALLBACK_CLASS,
TestPwdCallback.class.getName());
- inHandler.setProperty(WSHandlerConstants.IS_BSP_COMPLIANT, "false");
+ inHandler.setProperty(ConfigurationConstants.IS_BSP_COMPLIANT, "false");
return inHandler;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
index 1ef6466..99686ac 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
@@ -29,7 +29,7 @@ import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.transport.local.LocalTransportFactory;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.junit.Before;
import org.junit.Test;
@@ -55,18 +55,18 @@ public class RoundTripTest extends AbstractSecurityTest {
service.getOutInterceptors().add(new LoggingOutInterceptor());
wsIn = new WSS4JInInterceptor();
- wsIn.setProperty(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
- wsIn.setProperty(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
- wsIn.setProperty(WSHandlerConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
+ wsIn.setProperty(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ wsIn.setProperty(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
+ wsIn.setProperty(ConfigurationConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
service.getInInterceptors().add(wsIn);
wsOut = new WSS4JOutInterceptor();
- wsOut.setProperty(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- wsOut.setProperty(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
- wsOut.setProperty(WSHandlerConstants.USER, "myalias");
+ wsOut.setProperty(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ wsOut.setProperty(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties");
+ wsOut.setProperty(ConfigurationConstants.USER, "myalias");
wsOut.setProperty("password", "myAliasPassword");
- wsOut.setProperty(WSHandlerConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
+ wsOut.setProperty(ConfigurationConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
service.getOutInterceptors().add(wsOut);
// Create the client
@@ -88,28 +88,28 @@ public class RoundTripTest extends AbstractSecurityTest {
@Test
public void testSignature() throws Exception {
- wsIn.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- wsOut.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
+ wsIn.setProperty(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ wsOut.setProperty(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
assertEquals("test", echo.echo("test"));
}
@Test
public void testEncryptionPlusSig() throws Exception {
- wsIn.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT + " "
- + WSHandlerConstants.SIGNATURE);
- wsOut.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT + " "
- + WSHandlerConstants.SIGNATURE);
+ wsIn.setProperty(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT + " "
+ + ConfigurationConstants.SIGNATURE);
+ wsOut.setProperty(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT + " "
+ + ConfigurationConstants.SIGNATURE);
assertEquals("test", echo.echo("test"));
}
@Test
public void testUsernameToken() throws Exception {
- String actions = WSHandlerConstants.ENCRYPT + " " + WSHandlerConstants.SIGNATURE + " "
- + WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.USERNAME_TOKEN;
+ String actions = ConfigurationConstants.ENCRYPT + " " + ConfigurationConstants.SIGNATURE + " "
+ + ConfigurationConstants.TIMESTAMP + " " + ConfigurationConstants.USERNAME_TOKEN;
- wsIn.setProperty(WSHandlerConstants.ACTION, actions);
- wsOut.setProperty(WSHandlerConstants.ACTION, actions);
+ wsIn.setProperty(ConfigurationConstants.ACTION, actions);
+ wsOut.setProperty(ConfigurationConstants.ACTION, actions);
assertEquals("test", echo.echo("test"));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java
index c50cdf5..073de42 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java
@@ -30,6 +30,7 @@ import org.w3c.dom.Document;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.EncryptionActionToken;
import org.apache.wss4j.common.SignatureActionToken;
import org.apache.wss4j.dom.WSConstants;
@@ -56,11 +57,11 @@ public class SecurityActionTokenTest extends AbstractSecurityTest {
Map<String, Object> outProperties = new HashMap<>();
outProperties.put(WSHandlerConstants.HANDLER_ACTIONS, actions);
- outProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ outProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
List<String> xpaths = new ArrayList<>();
xpaths.add("//wsse:Security");
@@ -88,9 +89,9 @@ public class SecurityActionTokenTest extends AbstractSecurityTest {
outProperties.put(WSHandlerConstants.HANDLER_ACTIONS, actions);
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
List<String> xpaths = new ArrayList<>();
xpaths.add("//wsse:Security");
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
index ff1441b..2059e78 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
@@ -62,10 +63,10 @@ public class SignatureConfirmationTest extends AbstractSecurityTest {
SoapMessage msg = getSoapMessageForDom(doc);
- msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- msg.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
- msg.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
- msg.put(WSHandlerConstants.USER, "myalias");
+ msg.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ msg.put(ConfigurationConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
+ msg.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties");
+ msg.put(ConfigurationConstants.USER, "myalias");
msg.put("password", "myAliasPassword");
//
// This is necessary to convince the WSS4JOutInterceptor that we're
@@ -109,9 +110,9 @@ public class SignatureConfirmationTest extends AbstractSecurityTest {
ex.setInMessage(inmsg);
inmsg.setContent(SOAPMessage.class, saajMsg);
- inHandler.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
- inHandler.setProperty(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
- inHandler.setProperty(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
+ inHandler.setProperty(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
+ inHandler.setProperty(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inHandler.setProperty(ConfigurationConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
inHandler.handleMessage(inmsg);
@@ -138,7 +139,7 @@ public class SignatureConfirmationTest extends AbstractSecurityTest {
SoapMessage msg = getSoapMessageForDom(doc);
- msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.TIMESTAMP);
+ msg.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
msg.put(WSHandlerConstants.RECV_RESULTS, sigReceived);
handler.handleMessage(msg);
@@ -172,7 +173,7 @@ public class SignatureConfirmationTest extends AbstractSecurityTest {
ex.setInMessage(inmsg);
inmsg.setContent(SOAPMessage.class, saajMsg);
- inHandler.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.TIMESTAMP);
+ inHandler.setProperty(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
inmsg.put(WSHandlerConstants.SEND_SIGV, sigSaved);
inHandler.handleMessage(inmsg);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
index 274f208..dc5b125 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
@@ -33,8 +33,8 @@ import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.CryptoFactory;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
@@ -53,9 +53,9 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -92,9 +92,9 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -131,9 +131,9 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -170,10 +170,10 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
- inProperties.put(WSHandlerConstants.IS_BSP_COMPLIANT, "false");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.IS_BSP_COMPLIANT, "false");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
@@ -210,9 +210,9 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
- inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
+ inProperties.put(ConfigurationConstants.DEC_PROP_FILE, "insecurity.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
service.getInInterceptors().add(inInterceptor);
[07/12] cxf git commit: Fix unecessary "else" clauses in rt/frontend
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
index 075d683..ca4d94f 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
@@ -333,22 +333,20 @@ public class JaxWsImplementorInfo {
WebServiceProvider ann = cls.getAnnotation(WebServiceProvider.class);
if (null != ann) {
return ann;
- } else {
- if (ifAnnotationLoadedByOtherClassLoader(cls, WebServiceProvider.class)) {
- LOG.log(Level.WARNING,
- "WEBSERVICE_ANNOTATIONS_IS_LOADED_BY_OTHER_CLASSLOADER",
- WebServiceProvider.class.getName());
- }
+ }
+ if (ifAnnotationLoadedByOtherClassLoader(cls, WebServiceProvider.class)) {
+ LOG.log(Level.WARNING,
+ "WEBSERVICE_ANNOTATIONS_IS_LOADED_BY_OTHER_CLASSLOADER",
+ WebServiceProvider.class.getName());
}
for (Class<?> inf : cls.getInterfaces()) {
if (null != inf.getAnnotation(WebServiceProvider.class)) {
return inf.getAnnotation(WebServiceProvider.class);
- } else {
- if (ifAnnotationLoadedByOtherClassLoader(cls, WebServiceProvider.class)) {
- LOG.log(Level.WARNING,
- "WEBSERVICE_ANNOTATIONS_IS_LOADED_BY_OTHER_CLASSLOADER",
- WebServiceProvider.class.getName());
- }
+ }
+ if (ifAnnotationLoadedByOtherClassLoader(cls, WebServiceProvider.class)) {
+ LOG.log(Level.WARNING,
+ "WEBSERVICE_ANNOTATIONS_IS_LOADED_BY_OTHER_CLASSLOADER",
+ WebServiceProvider.class.getName());
}
}
return getWebServiceProviderAnnotation(cls.getSuperclass());
@@ -383,9 +381,8 @@ public class JaxWsImplementorInfo {
if (Provider.class == clazz) {
Type paramTypes[] = ((ParameterizedType)t).getActualTypeArguments();
return JAXBEncoderDecoder.getClassFromType(paramTypes[0]);
- } else {
- return doGetProviderParameterType(clazz);
}
+ return doGetProviderParameterType(clazz);
}
}
c = c.getSuperclass();
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
index 707feb2..90cb931 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
@@ -145,9 +145,8 @@ public class JaxWsServiceConfiguration extends AbstractServiceConfiguration {
}
return new QName(intf.getName().getNamespaceURI(), name);
- } else {
- return new QName(intf.getName().getNamespaceURI(), method.getName());
}
+ return new QName(intf.getName().getNamespaceURI(), method.getName());
}
public Boolean isWebMethod(final Method method) {
@@ -361,20 +360,19 @@ public class JaxWsServiceConfiguration extends AbstractServiceConfiguration {
}
if (parameter >= annotations.length) {
return null;
- } else {
- for (int i = 0; i < annotations[parameter].length; i++) {
- Annotation annotation = annotations[parameter][i];
- // With the ibm jdk, the condition:
- // if (annotation.annotationType().equals(WebParam.class)) {
- // SOMETIMES returns false even when the annotation type
- // is a WebParam. Doing an instanceof check or using the
- // == operator seems to give the desired result.
- if (annotation instanceof WebParam) {
- return (WebParam)annotation;
- }
+ }
+ for (int i = 0; i < annotations[parameter].length; i++) {
+ Annotation annotation = annotations[parameter][i];
+ // With the ibm jdk, the condition:
+ // if (annotation.annotationType().equals(WebParam.class)) {
+ // SOMETIMES returns false even when the annotation type
+ // is a WebParam. Doing an instanceof check or using the
+ // == operator seems to give the desired result.
+ if (annotation instanceof WebParam) {
+ return (WebParam)annotation;
}
- return null;
}
+ return null;
}
@Override
public String getRequestWrapperPartName(OperationInfo op, Method method) {
@@ -451,37 +449,36 @@ public class JaxWsServiceConfiguration extends AbstractServiceConfiguration {
if (paramNumber >= 0) {
return getParameterName(op, method, paramNumber, op.getOutput().size(), "return", false);
- } else {
- WebResult webResult = getWebResult(method);
+ }
+ WebResult webResult = getWebResult(method);
- String tns = null;
- String local = null;
- if (webResult != null) {
- tns = webResult.targetNamespace();
- local = webResult.name();
- }
- if (tns == null || tns.length() == 0) {
- QName wrappername = getResponseWrapperName(op, method);
- if (wrappername != null) {
- tns = wrappername.getNamespaceURI();
- }
+ String tns = null;
+ String local = null;
+ if (webResult != null) {
+ tns = webResult.targetNamespace();
+ local = webResult.name();
+ }
+ if (tns == null || tns.length() == 0) {
+ QName wrappername = getResponseWrapperName(op, method);
+ if (wrappername != null) {
+ tns = wrappername.getNamespaceURI();
}
+ }
- if (tns == null || tns.length() == 0) {
- tns = op.getName().getNamespaceURI();
- }
+ if (tns == null || tns.length() == 0) {
+ tns = op.getName().getNamespaceURI();
+ }
- if (local == null || local.length() == 0) {
- if (Boolean.TRUE.equals(isRPC(method)) || !Boolean.FALSE.equals(isWrapped(method))) {
- local = getDefaultLocalName(op, method, paramNumber, op.getOutput().size(), "return");
- } else {
- local = getOperationName(op.getInterface(),
- method).getLocalPart() + "Response";
- }
+ if (local == null || local.length() == 0) {
+ if (Boolean.TRUE.equals(isRPC(method)) || !Boolean.FALSE.equals(isWrapped(method))) {
+ local = getDefaultLocalName(op, method, paramNumber, op.getOutput().size(), "return");
+ } else {
+ local = getOperationName(op.getInterface(),
+ method).getLocalPart() + "Response";
}
-
- return new QName(tns, local);
}
+
+ return new QName(tns, local);
}
@Override
@@ -490,29 +487,28 @@ public class JaxWsServiceConfiguration extends AbstractServiceConfiguration {
if (paramNumber >= 0) {
return getPartName(op, method, paramNumber, op.getOutput(), "return", false);
- } else {
- WebResult webResult = getWebResult(method);
- String tns = op.getOutput().getName().getNamespaceURI();
- String local = null;
- if (webResult != null) {
- if (Boolean.TRUE.equals(isRPC(method)) || isDocumentBare(method)) {
- local = webResult.partName();
- }
- if (local == null || local.length() == 0) {
- local = webResult.name();
- }
+ }
+ WebResult webResult = getWebResult(method);
+ String tns = op.getOutput().getName().getNamespaceURI();
+ String local = null;
+ if (webResult != null) {
+ if (Boolean.TRUE.equals(isRPC(method)) || isDocumentBare(method)) {
+ local = webResult.partName();
}
-
if (local == null || local.length() == 0) {
- if (Boolean.TRUE.equals(isRPC(method)) || !Boolean.FALSE.equals(isWrapped(method))) {
- local = "return";
- } else {
- local = getOperationName(op.getInterface(), method).getLocalPart() + "Response";
- }
+ local = webResult.name();
}
+ }
- return new QName(tns, local);
+ if (local == null || local.length() == 0) {
+ if (Boolean.TRUE.equals(isRPC(method)) || !Boolean.FALSE.equals(isWrapped(method))) {
+ local = "return";
+ } else {
+ local = getOperationName(op.getInterface(), method).getLocalPart() + "Response";
+ }
}
+
+ return new QName(tns, local);
}
@Override
@@ -787,10 +783,9 @@ public class JaxWsServiceConfiguration extends AbstractServiceConfiguration {
if (j >= 0) {
WebParam webParam = getWebParam(method, j);
return webParam != null && webParam.header();
- } else {
- WebResult webResult = getWebResult(method);
- return webResult != null && webResult.header();
}
+ WebResult webResult = getWebResult(method);
+ return webResult != null && webResult.header();
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
index 55574c4..cae4b09 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
@@ -104,9 +104,8 @@ public class JAXWSHttpSpiDestination extends AbstractHTTPDestination {
Throwable cause = ex.getCause();
if (cause instanceof RuntimeException) {
throw (RuntimeException)cause;
- } else {
- throw ex;
}
+ throw ex;
} catch (RuntimeException ex) {
throw ex;
} finally {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java
----------------------------------------------------------------------
diff --git a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java
index d22416c..5f7218c 100644
--- a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java
+++ b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java
@@ -140,9 +140,8 @@ public class ServerApp {
if (f.isFile()) {
String name = f.getName();
return name.endsWith(".js") || name.endsWith(".jsx");
- } else {
- return false;
}
+ return false;
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index 448e0b8..2c99ac3 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -729,9 +729,8 @@ public class DynamicClientFactory {
if (resolver.isResolved()) {
return resolver.getURI().toURL();
- } else {
- throw new ServiceConstructionException(new Message("COULD_NOT_RESOLVE_URL", LOG, s));
}
+ throw new ServiceConstructionException(new Message("COULD_NOT_RESOLVE_URL", LOG, s));
} catch (IOException e) {
throw new ServiceConstructionException(new Message("COULD_NOT_RESOLVE_URL", LOG, s), e);
}
@@ -802,9 +801,8 @@ public class DynamicClientFactory {
File file = new File(baseURI, systemId);
if (file.exists()) {
return new InputSource(Files.newInputStream(file.toPath()));
- } else {
- return new InputSource(systemId);
}
+ return new InputSource(systemId);
}
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
index b74c77f..d0670ca 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
@@ -97,9 +97,8 @@ public class ClientProxy implements InvocationHandler, Closeable {
if (rawRet != null && rawRet.length > 0) {
return rawRet[0];
- } else {
- return null;
}
+ return null;
}
public Map<String, Object> getRequestContext() {
if (client == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
index a279a7f..b314dca 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
@@ -286,9 +286,8 @@ public class ServerFactoryBean extends AbstractWSDLBasedEndpointFactory {
public Class<?> getServiceBeanClass() {
if (serviceBean != null) {
return ClassHelper.getRealClass(getBus(), serviceBean);
- } else {
- return getServiceFactory().getServiceClass();
}
+ return getServiceFactory().getServiceClass();
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/903ef61f/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index ff1b254..9327c81 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -482,11 +482,10 @@ public class WSDLGetUtils {
if (name == null) {
setSoapAddressLocationOn(ports.iterator().next(), publishingUrl);
break; // only update the first port since we don't target any specific port
- } else {
- for (Port port : ports) {
- if (name.getLocalPart().equals(port.getName())) {
- setSoapAddressLocationOn(port, publishingUrl);
- }
+ }
+ for (Port port : ports) {
+ if (name.getLocalPart().equals(port.getName())) {
+ setSoapAddressLocationOn(port, publishingUrl);
}
}
}
[02/12] cxf git commit: Remove bunch of unnecessary casts and change
a bunch of calls to static methods to use the appropriate static class
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
index cbf5219..613a3b2 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
@@ -28,6 +28,7 @@ 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.rt.security.SecurityConstants;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
@@ -99,8 +100,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase {
URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -153,8 +154,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase {
URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -187,8 +188,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase {
URL busFile = SamlSubjectConfTest.class.getResource("client-noauth.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -230,8 +231,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase {
URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -261,8 +262,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase {
URL busFile = SamlSubjectConfTest.class.getResource("client-noauth.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -300,8 +301,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase {
URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -335,8 +336,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase {
URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -371,8 +372,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase {
URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
index b5ea117..be25805 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
@@ -227,8 +227,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = SecurityPolicyTest.class.getResource("https_config_client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -351,8 +351,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus();
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -412,8 +412,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus();
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -506,8 +506,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus();
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -541,8 +541,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus();
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -576,8 +576,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus();
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -608,8 +608,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus();
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -661,8 +661,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus();
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
Service service = Service.create(wsdl, SERVICE_QNAME);
QName portQName = new QName(NAMESPACE, "DoubleItPortCXF4122");
@@ -706,8 +706,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = SecurityPolicyTest.class.getResource("https_config_client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java
index 47a762d..e34332f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java
@@ -25,6 +25,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.ws.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -64,8 +65,8 @@ public class SWAActionTest extends AbstractBusClientServerTestBase {
URL busFile = SWAActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAActionTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -89,8 +90,8 @@ public class SWAActionTest extends AbstractBusClientServerTestBase {
URL busFile = SWAActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAActionTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -114,8 +115,8 @@ public class SWAActionTest extends AbstractBusClientServerTestBase {
URL busFile = SWAActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAActionTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -139,8 +140,8 @@ public class SWAActionTest extends AbstractBusClientServerTestBase {
URL busFile = SWAActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAActionTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -164,8 +165,8 @@ public class SWAActionTest extends AbstractBusClientServerTestBase {
URL busFile = SWAActionTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAActionTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
index 9be49b5..f998c59 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
@@ -28,6 +28,7 @@ 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.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
@@ -95,8 +96,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = SWAPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -124,8 +125,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = SWAPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -153,8 +154,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = SWAPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -182,8 +183,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = SWAPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -211,8 +212,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = SWAPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -240,8 +241,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = SWAPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -269,8 +270,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = SWAPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java
index f7515a1..f0a01cf 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java
@@ -28,6 +28,7 @@ import javax.xml.ws.Service;
import org.w3c.dom.Document;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
@@ -71,8 +72,8 @@ public class BinarySecurityTokenTest extends AbstractBusClientServerTestBase {
URL busFile = BinarySecurityTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = BinarySecurityTokenTest.class.getResource("DoubleItTokens.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
index 6024c1e..861d87e 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.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.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
@@ -91,8 +92,8 @@ public class EndorsingSupportingTokenTest extends AbstractBusClientServerTestBas
URL busFile = EndorsingSupportingTokenTest.class.getResource("endorsing-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = EndorsingSupportingTokenTest.class.getResource("DoubleItTokens.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -145,8 +146,8 @@ public class EndorsingSupportingTokenTest extends AbstractBusClientServerTestBas
URL busFile = EndorsingSupportingTokenTest.class.getResource("endorsing-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = EndorsingSupportingTokenTest.class.getResource("DoubleItTokens.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
index 974a9b4..267155f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.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.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
@@ -107,8 +108,8 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SupportingTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SupportingTokenTest.class.getResource("DoubleItTokens.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -171,8 +172,8 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SupportingTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SupportingTokenTest.class.getResource("DoubleItTokens.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -235,8 +236,8 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SupportingTokenTest.class.getResource("tls-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SupportingTokenTest.class.getResource("DoubleItTokens.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -291,8 +292,8 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SupportingTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SupportingTokenTest.class.getResource("DoubleItTokens.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
index a278839..0106e96 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
@@ -25,6 +25,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.ws.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -71,8 +72,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -98,8 +99,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -125,8 +126,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -152,8 +153,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -179,8 +180,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -206,8 +207,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -233,8 +234,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
index 66aec03..ad7b124 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.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.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
@@ -92,8 +93,8 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -137,8 +138,8 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -198,8 +199,8 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -259,8 +260,8 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -304,8 +305,8 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
index 47b58e6..0bd4f55 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
@@ -28,6 +28,7 @@ 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.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
@@ -97,8 +98,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);
@@ -124,8 +125,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);
@@ -151,8 +152,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);
@@ -178,8 +179,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);
@@ -205,8 +206,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);
@@ -232,8 +233,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);
@@ -259,8 +260,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);
@@ -286,8 +287,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);
@@ -313,8 +314,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);
@@ -340,8 +341,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);
@@ -374,8 +375,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);
@@ -414,8 +415,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);
@@ -452,8 +453,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/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
index fe6afde..317d628 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
@@ -35,6 +35,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.rt.security.SecurityConstants;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
@@ -110,8 +111,8 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase {
URL busFile = WSSCUnitTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = WSSCUnitTest.class.getResource("DoubleItWSSC.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -136,8 +137,8 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase {
URL busFile = WSSCUnitTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = WSSCUnitTest.class.getResource("DoubleItWSSC.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -166,8 +167,8 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase {
URL busFile = WSSCUnitTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
STSClient stsClient = new STSClient(bus);
stsClient.setSecureConv(true);
@@ -197,8 +198,8 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase {
URL busFile = WSSCUnitTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
STSClient stsClient = new STSClient(bus);
stsClient.setSecureConv(true);
@@ -232,8 +233,8 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase {
URL busFile = WSSCUnitTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
STSClient stsClient = new STSClient(bus);
stsClient.setSecureConv(true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index f050d3b..099fb5f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -30,6 +30,7 @@ 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.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
@@ -115,8 +116,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);
@@ -151,8 +152,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);
@@ -178,8 +179,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);
@@ -205,8 +206,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);
@@ -232,8 +233,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);
@@ -259,8 +260,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
URL busFile = X509TokenTest.class.getResource("jaxws-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);
@@ -290,8 +291,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);
@@ -323,8 +324,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
URL busFile = X509TokenTest.class.getResource("intermediary-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("DoubleItIntermediary.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -346,8 +347,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);
@@ -373,8 +374,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);
@@ -400,8 +401,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);
@@ -425,8 +426,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);
@@ -450,8 +451,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);
@@ -477,8 +478,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);
@@ -502,8 +503,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);
@@ -529,8 +530,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);
@@ -556,8 +557,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);
@@ -584,8 +585,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);
@@ -611,8 +612,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);
@@ -642,8 +643,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);
@@ -669,8 +670,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);
@@ -696,8 +697,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);
@@ -723,8 +724,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);
@@ -750,8 +751,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);
@@ -777,8 +778,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);
@@ -804,8 +805,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);
@@ -831,8 +832,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);
@@ -858,8 +859,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);
@@ -885,8 +886,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);
@@ -914,8 +915,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);
@@ -941,8 +942,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);
@@ -971,8 +972,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);
@@ -1002,8 +1003,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);
@@ -1033,8 +1034,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);
@@ -1064,8 +1065,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);
@@ -1095,8 +1096,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);
@@ -1126,8 +1127,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("DoubleItX509Signature.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -1153,8 +1154,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("DoubleItX509Signature.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -1180,8 +1181,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("DoubleItX509Signature.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -1207,8 +1208,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("DoubleItX509Signature.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -1237,8 +1238,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("DoubleItX509Signature.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -1272,8 +1273,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);
@@ -1303,8 +1304,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);
@@ -1352,8 +1353,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);
@@ -1387,8 +1388,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("DoubleItOperations.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -1424,8 +1425,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);
@@ -1474,8 +1475,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);
@@ -1524,8 +1525,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("DoubleItX509Signature.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -1551,8 +1552,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);
@@ -1578,8 +1579,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("DoubleItX509Addressing.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
index da55848..2bfe572 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.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.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
@@ -101,8 +102,8 @@ public class XKMSTest extends AbstractBusClientServerTestBase {
URL busFile = XKMSTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = XKMSTest.class.getResource("DoubleItXKMS.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -131,8 +132,8 @@ public class XKMSTest extends AbstractBusClientServerTestBase {
URL busFile = XKMSTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = XKMSTest.class.getResource("DoubleItXKMS.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
[09/12] cxf git commit: Fix static references to appropraite class
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
index 2eaf438..aa6d0a0 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
@@ -49,6 +49,7 @@ import org.apache.cxf.ws.security.wss4j.AbstractSecurityTest;
import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
import org.apache.cxf.ws.security.wss4j.saml.AbstractSAMLCallbackHandler.Statement;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.principal.SAMLTokenPrincipal;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
@@ -83,11 +84,11 @@ public class SamlTokenTest extends AbstractSecurityTest {
private SecurityContext testSaml1Token(boolean allowUnsignedPrincipal) throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -122,19 +123,19 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml1TokenSignedSenderVouches() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -165,11 +166,11 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml2Token() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -199,19 +200,19 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml2TokenSignedSenderVouches() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -246,22 +247,22 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml1TokenHOK() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -302,22 +303,22 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml2TokenHOK() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -366,24 +367,24 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml2TokenWithRoles() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
callbackHandler.setStatement(Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED
+ ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -424,24 +425,24 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml2TokenWithRolesSingleValue() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler(false);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
callbackHandler.setStatement(Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED
+ ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -481,24 +482,24 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml1TokenWithRoles() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
callbackHandler.setStatement(Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_BEARER);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED
+ ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
index 905f96b..4d35b94 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
@@ -46,7 +46,6 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
@@ -64,7 +63,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -101,7 +100,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -137,10 +136,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -181,10 +180,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -219,7 +218,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -257,7 +256,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -294,10 +293,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -339,10 +338,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -379,10 +378,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -439,10 +438,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -492,10 +491,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -560,10 +559,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
[06/12] cxf git commit: Fix unecessary "else" clauses in rt/management
Posted by dk...@apache.org.
Fix unecessary "else" clauses in rt/management
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/31e53648
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/31e53648
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/31e53648
Branch: refs/heads/master
Commit: 31e536485d6639a72b875e8619424c2cab60d20c
Parents: ed5dfc9
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 14:31:00 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 14:31:00 2017 -0400
----------------------------------------------------------------------
rt/management/pom.xml | 2 +-
.../AbstractMessageResponseTimeInterceptor.java | 11 +++++------
.../jmx/export/runtime/ModelMBeanAssembler.java | 3 +--
.../org/apache/cxf/tracing/AbstractTracingProvider.java | 3 +--
4 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/31e53648/rt/management/pom.xml
----------------------------------------------------------------------
diff --git a/rt/management/pom.xml b/rt/management/pom.xml
index 108ac3a..b0c19bf 100644
--- a/rt/management/pom.xml
+++ b/rt/management/pom.xml
@@ -94,7 +94,7 @@
<extension>true</extension>
<bindingFile>${basedir}/src/main/build-resources/instrumentation.xjb</bindingFile>
<extensionArgs>
- <extensionArg>-Xdv</extensionArg>
+ <extensionArg>-Xdv:attributes</extensionArg>
</extensionArgs>
</xsdOption>
</xsdOptions>
http://git-wip-us.apache.org/repos/asf/cxf/blob/31e53648/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java b/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
index d940293..483ced6 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
@@ -101,13 +101,12 @@ public abstract class AbstractMessageResponseTimeInterceptor extends AbstractPha
if (null == cr) {
LOG.log(Level.WARNING, "NO_COUNTER_REPOSITORY");
return;
- } else {
- ObjectName serviceCountername = this.getServiceCounterName(ex);
- cr.increaseCounter(serviceCountername, mhtr);
-
- ObjectName operationCounter = this.getOperationCounterName(ex, serviceCountername);
- cr.increaseCounter(operationCounter, mhtr);
}
+ ObjectName serviceCountername = this.getServiceCounterName(ex);
+ cr.increaseCounter(serviceCountername, mhtr);
+
+ ObjectName operationCounter = this.getOperationCounterName(ex, serviceCountername);
+ cr.increaseCounter(operationCounter, mhtr);
}
protected ObjectName getServiceCounterName(Exchange ex) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/31e53648/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanAssembler.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanAssembler.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanAssembler.java
index 23bc519..e8332ae 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanAssembler.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanAssembler.java
@@ -152,9 +152,8 @@ public class ModelMBeanAssembler {
for (int i = 0; i < methods.length; i++) {
if (methods[i].getName().compareTo(methodName) == 0) {
return methods[i];
- } else {
- continue;
}
+ continue;
}
return null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/31e53648/rt/management/src/main/java/org/apache/cxf/tracing/AbstractTracingProvider.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/tracing/AbstractTracingProvider.java b/rt/management/src/main/java/org/apache/cxf/tracing/AbstractTracingProvider.java
index 8e9c435..d2eafef 100644
--- a/rt/management/src/main/java/org/apache/cxf/tracing/AbstractTracingProvider.java
+++ b/rt/management/src/main/java/org/apache/cxf/tracing/AbstractTracingProvider.java
@@ -71,8 +71,7 @@ public abstract class AbstractTracingProvider {
protected String buildSpanDescription(final String path, final String method) {
if (StringUtils.isEmpty(method)) {
return path;
- } else {
- return method + " " + path;
}
+ return method + " " + path;
}
}