cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1501177 [2/3] - in /cxf/trunk/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/action/ java/org/apache/cxf/systest/ws/algsuite/ java/org/apache/cxf/systest/ws/bindings/ java/org/apache/cxf/systest/ws/coverage_checker/ java/org...
Date Tue, 09 Jul 2013 10:07:31 GMT
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java Tue Jul  9 10:07:29 2013
@@ -69,7 +69,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml1OverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -130,7 +130,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml1OverTransportStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -193,7 +193,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml1Supporting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -228,7 +228,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml1ElementOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -262,7 +262,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml1ElementOverTransportStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -297,7 +297,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2OverSymmetric() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -341,7 +341,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2OverSymmetricStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -389,7 +389,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2OverSymmetricSupporting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -421,7 +421,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2OverAsymmetric() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -482,7 +482,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2OverAsymmetricStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -545,7 +545,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml1SelfSignedOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -572,7 +572,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml1SelfSignedOverTransportStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -600,7 +600,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml1SelfSignedOverTransportSP11() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -627,7 +627,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml1SelfSignedOverTransportSP11Streaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -655,7 +655,7 @@ public class StaxSamlTokenTest extends A
     public void testAsymmetricSamlInitiator() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -686,7 +686,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2EndorsingOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -718,7 +718,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2EndorsingPKOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -749,7 +749,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2EndorsingOverTransportSP11() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -779,7 +779,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2EndorsingOverTransportSP11Streaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -810,7 +810,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2OverAsymmetricSignedEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -837,7 +837,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2OverAsymmetricSignedEncryptedStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -865,7 +865,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2OverAsymmetricEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -894,7 +894,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2OverAsymmetricEncryptedStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -924,7 +924,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2EndorsingEncryptedOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -954,7 +954,7 @@ public class StaxSamlTokenTest extends A
     public void testNoSamlToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -983,7 +983,7 @@ public class StaxSamlTokenTest extends A
     public void testNoSamlTokenStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -1015,7 +1015,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2PEP() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -1064,7 +1064,7 @@ public class StaxSamlTokenTest extends A
     public void testSaml2PEPStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxSamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxSamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java Tue Jul  9 10:07:29 2013
@@ -80,7 +80,7 @@ public class SpnegoTokenTest extends Abs
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SpnegoTokenTest.class.getResource("client/client.xml");
+        URL busFile = SpnegoTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -108,7 +108,7 @@ public class SpnegoTokenTest extends Abs
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SpnegoTokenTest.class.getResource("client/client.xml");
+        URL busFile = SpnegoTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java Tue Jul  9 10:07:29 2013
@@ -63,7 +63,7 @@ public class EndorsingSupportingTokenTes
     public void testEndorsingSupporting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = EndorsingSupportingTokenTest.class.getResource("client/endorsing-client.xml");
+        URL busFile = EndorsingSupportingTokenTest.class.getResource("endorsing-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -114,7 +114,7 @@ public class EndorsingSupportingTokenTes
     public void testSignedEndorsingSupporting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = EndorsingSupportingTokenTest.class.getResource("client/endorsing-client.xml");
+        URL busFile = EndorsingSupportingTokenTest.class.getResource("endorsing-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java Tue Jul  9 10:07:29 2013
@@ -63,7 +63,7 @@ public class SupportingTokenTest extends
     public void testSignedSupporting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SupportingTokenTest.class.getResource("client/client.xml");
+        URL busFile = SupportingTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -112,7 +112,7 @@ public class SupportingTokenTest extends
     public void testEncryptedSupporting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SupportingTokenTest.class.getResource("client/client.xml");
+        URL busFile = SupportingTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -161,7 +161,7 @@ public class SupportingTokenTest extends
     public void testSignedEncryptedSupporting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SupportingTokenTest.class.getResource("client/client.xml");
+        URL busFile = SupportingTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxUsernameTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxUsernameTokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxUsernameTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxUsernameTokenTest.java Tue Jul  9 10:07:29 2013
@@ -65,7 +65,7 @@ public class StaxUsernameTokenTest exten
     public void testPlaintext() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxUsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxUsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -93,7 +93,7 @@ public class StaxUsernameTokenTest exten
     public void testPlaintextCreated() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxUsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxUsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -121,7 +121,7 @@ public class StaxUsernameTokenTest exten
     public void testPlaintextSupporting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxUsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxUsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -149,7 +149,7 @@ public class StaxUsernameTokenTest exten
     public void testPasswordHashed() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxUsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxUsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -177,7 +177,7 @@ public class StaxUsernameTokenTest exten
     public void testNoPassword() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxUsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxUsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -205,7 +205,7 @@ public class StaxUsernameTokenTest exten
     public void testSignedEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxUsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxUsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -233,7 +233,7 @@ public class StaxUsernameTokenTest exten
     public void testSignedEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxUsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxUsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -261,7 +261,7 @@ public class StaxUsernameTokenTest exten
     public void testEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxUsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxUsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -289,7 +289,7 @@ public class StaxUsernameTokenTest exten
     public void testNoUsernameToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxUsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxUsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -331,7 +331,7 @@ public class StaxUsernameTokenTest exten
     public void testPasswordHashedReplay() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxUsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxUsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -368,7 +368,7 @@ public class StaxUsernameTokenTest exten
     public void testPlaintextPrincipal() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxUsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxUsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java Tue Jul  9 10:07:29 2013
@@ -68,7 +68,7 @@ public class UsernameTokenDerivedTest ex
     public void testSymmetricProtectionSignatureToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenDerivedTest.class.getResource("client/client-derived.xml");
+        URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -95,7 +95,7 @@ public class UsernameTokenDerivedTest ex
     public void testSymmetricProtectionSignatureDKToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenDerivedTest.class.getResource("client/client-derived.xml");
+        URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -122,7 +122,7 @@ public class UsernameTokenDerivedTest ex
     public void testSymmetricProtectionEncryptionToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenDerivedTest.class.getResource("client/client-derived.xml");
+        URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -149,7 +149,7 @@ public class UsernameTokenDerivedTest ex
     public void testTransportEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenDerivedTest.class.getResource("client/client-derived.xml");
+        URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -176,7 +176,7 @@ public class UsernameTokenDerivedTest ex
     public void testSymmetricSignedEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenDerivedTest.class.getResource("client/client-derived.xml");
+        URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -203,7 +203,7 @@ public class UsernameTokenDerivedTest ex
     public void testSymmetricEndorsingEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenDerivedTest.class.getResource("client/client-derived.xml");
+        URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -230,7 +230,7 @@ public class UsernameTokenDerivedTest ex
     public void testSymmetricSignedEndorsingEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenDerivedTest.class.getResource("client/client-derived.xml");
+        URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java Tue Jul  9 10:07:29 2013
@@ -60,7 +60,7 @@ public class UsernameTokenPolicyTest ext
     public void testSupportingToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenPolicyTest.class.getResource("client/policy-client.xml");
+        URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -96,7 +96,7 @@ public class UsernameTokenPolicyTest ext
     public void testPlaintextPassword() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenPolicyTest.class.getResource("client/policy-client.xml");
+        URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -144,7 +144,7 @@ public class UsernameTokenPolicyTest ext
     public void testHashPassword() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenPolicyTest.class.getResource("client/policy-client.xml");
+        URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -192,7 +192,7 @@ public class UsernameTokenPolicyTest ext
     public void testCreated() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenPolicyTest.class.getResource("client/policy-client.xml");
+        URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -228,7 +228,7 @@ public class UsernameTokenPolicyTest ext
     public void testNonce() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenPolicyTest.class.getResource("client/policy-client.xml");
+        URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java Tue Jul  9 10:07:29 2013
@@ -65,7 +65,7 @@ public class UsernameTokenTest extends A
     public void testPlaintext() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -93,7 +93,7 @@ public class UsernameTokenTest extends A
     public void testPlaintextCreated() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -121,7 +121,7 @@ public class UsernameTokenTest extends A
     public void testPlaintextSupporting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -149,7 +149,7 @@ public class UsernameTokenTest extends A
     public void testPasswordHashed() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -177,7 +177,7 @@ public class UsernameTokenTest extends A
     public void testNoPassword() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -205,7 +205,7 @@ public class UsernameTokenTest extends A
     public void testSignedEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -233,7 +233,7 @@ public class UsernameTokenTest extends A
     public void testSignedEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -261,7 +261,7 @@ public class UsernameTokenTest extends A
     public void testEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -289,7 +289,7 @@ public class UsernameTokenTest extends A
     public void testNoUsernameToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -332,7 +332,7 @@ public class UsernameTokenTest extends A
     public void testPasswordHashedReplay() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -371,7 +371,7 @@ public class UsernameTokenTest extends A
     public void testPasswordHashedNoBindingReplay() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -408,7 +408,7 @@ public class UsernameTokenTest extends A
     public void testPlaintextPrincipal() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = UsernameTokenTest.class.getResource("client/client.xml");
+        URL busFile = UsernameTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java Tue Jul  9 10:07:29 2013
@@ -52,7 +52,7 @@ public class WSSCTest extends AbstractBu
             launchServer(Server.class, true)
         );
         
-        bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssc/client/client.xml");
+        bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssc/client.xml");
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);
         

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/StaxWSSecurity10Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/StaxWSSecurity10Test.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/StaxWSSecurity10Test.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/StaxWSSecurity10Test.java Tue Jul  9 10:07:29 2013
@@ -87,7 +87,7 @@ public class StaxWSSecurity10Test extend
         //argv = new String[] {argv[1]};
         Bus bus = null;
         if (unrestrictedPoliciesInstalled) {
-            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec10/client/client.xml");
+            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec10/client.xml");
         } else {
             bus = new SpringBusFactory().createBus(
                     "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml");
@@ -138,7 +138,7 @@ public class StaxWSSecurity10Test extend
         //argv = new String[] {argv[1]};
         Bus bus = null;
         if (unrestrictedPoliciesInstalled) {
-            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec10/client/client.xml");
+            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec10/client.xml");
         } else {
             bus = new SpringBusFactory().createBus(
                     "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml");

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java Tue Jul  9 10:07:29 2013
@@ -87,7 +87,7 @@ public class WSSecurity10Test extends Ab
         //argv = new String[] {argv[1]};
         Bus bus = null;
         if (unrestrictedPoliciesInstalled) {
-            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec10/client/client.xml");
+            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec10/client.xml");
         } else {
             bus = new SpringBusFactory().createBus(
                     "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml");
@@ -138,7 +138,7 @@ public class WSSecurity10Test extends Ab
         //argv = new String[] {argv[1]};
         Bus bus = null;
         if (unrestrictedPoliciesInstalled) {
-            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec10/client/client.xml");
+            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec10/client.xml");
         } else {
             bus = new SpringBusFactory().createBus(
                     "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml");

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java Tue Jul  9 10:07:29 2013
@@ -68,7 +68,7 @@ public class WSSecurity10UsernameAuthori
     @Test
     public void testClientServerComplexPolicyAuthorized() {
 
-        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml";
+        String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted.xml";
         Bus bus = new SpringBusFactory().createBus(configName);
         IPingService port = getComplexPolicyPort(bus);
         
@@ -81,7 +81,7 @@ public class WSSecurity10UsernameAuthori
     @Test
     public void testClientServerComplexPolicyUnauthorized() {
 
-        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml";
+        String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml";
         Bus bus = new SpringBusFactory().createBus(configName);
         IPingService port = getComplexPolicyPort(bus);
         

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java Tue Jul  9 10:07:29 2013
@@ -69,7 +69,7 @@ public class WSSecurity10UsernameAuthori
     @Test
     public void testClientServerUTOnlyAuthorized() throws IOException {
 
-        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml";
+        String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted.xml";
         Bus bus = new SpringBusFactory().createBus(configName);
         IPingService port = getUTOnlyPort(bus, false);
         
@@ -83,7 +83,7 @@ public class WSSecurity10UsernameAuthori
     @Test
     public void testClientServerUTOnlyUnauthorized() throws IOException {
 
-        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml";
+        String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml";
         Bus bus = new SpringBusFactory().createBus(configName);
         IPingService port = getUTOnlyPort(bus, true);
         
@@ -101,7 +101,7 @@ public class WSSecurity10UsernameAuthori
     @Test
     public void testClientServerComplexPolicyAuthorized() throws IOException {
 
-        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml";
+        String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted.xml";
         Bus bus = new SpringBusFactory().createBus(configName);
         IPingService port = getComplexPolicyPort(bus);
         
@@ -115,7 +115,7 @@ public class WSSecurity10UsernameAuthori
     @Test
     public void testClientServerComplexPolicyUnauthorized() throws IOException {
 
-        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml";
+        String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml";
         Bus bus = new SpringBusFactory().createBus(configName);
         IPingService port = getComplexPolicyPort(bus);
         

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java Tue Jul  9 10:07:29 2013
@@ -52,10 +52,10 @@ public class WSSecurity11Common extends 
         
         Bus bus = null;
         if (unrestrictedPoliciesInstalled) {
-            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/client/client.xml");
+            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/client.xml");
         } else {
             bus = new SpringBusFactory().createBus(
-                    "org/apache/cxf/systest/ws/wssec11/client/client_restricted.xml");
+                    "org/apache/cxf/systest/ws/wssec11/client_restricted.xml");
         }
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);
@@ -96,10 +96,10 @@ public class WSSecurity11Common extends 
 
         Bus bus = null;
         if (unrestrictedPoliciesInstalled) {
-            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/client/client.xml");
+            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/client.xml");
         } else {
             bus = new SpringBusFactory().createBus(
-                      "org/apache/cxf/systest/ws/wssec11/client/client_restricted.xml");
+                      "org/apache/cxf/systest/ws/wssec11/client_restricted.xml");
         }
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java Tue Jul  9 10:07:29 2013
@@ -72,7 +72,7 @@ public class StaxX509TokenTest extends A
     public void testKeyIdentifier() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -100,7 +100,7 @@ public class StaxX509TokenTest extends A
     public void testKeyIdentifierJaxwsClient() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/jaxws-client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("jaxws-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -132,7 +132,7 @@ public class StaxX509TokenTest extends A
     public void testIssuerSerial() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -160,7 +160,7 @@ public class StaxX509TokenTest extends A
     public void testThumbprint() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -188,7 +188,7 @@ public class StaxX509TokenTest extends A
     public void testAsymmetricIssuerSerial() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -216,7 +216,7 @@ public class StaxX509TokenTest extends A
     public void testAsymmetricThumbprint() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -244,7 +244,7 @@ public class StaxX509TokenTest extends A
     public void testAsymmetricEncryptBeforeSigning() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -272,7 +272,7 @@ public class StaxX509TokenTest extends A
     public void testAsymmetricEncryptSignature() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -300,7 +300,7 @@ public class StaxX509TokenTest extends A
     public void testAsymmetricProtectTokens() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -328,7 +328,7 @@ public class StaxX509TokenTest extends A
     public void testAsymmetricUsernameToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -358,7 +358,7 @@ public class StaxX509TokenTest extends A
     public void testSymmetricProtectTokens() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -382,7 +382,7 @@ public class StaxX509TokenTest extends A
     public void testTransportEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -410,7 +410,7 @@ public class StaxX509TokenTest extends A
     public void testTransportEndorsingSP11() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -438,7 +438,7 @@ public class StaxX509TokenTest extends A
     public void testTransportSignedEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -466,7 +466,7 @@ public class StaxX509TokenTest extends A
     public void testTransportEndorsingEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -494,7 +494,7 @@ public class StaxX509TokenTest extends A
     public void testTransportSignedEndorsingEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -522,7 +522,7 @@ public class StaxX509TokenTest extends A
     public void testAsymmetricSignature() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -550,7 +550,7 @@ public class StaxX509TokenTest extends A
     public void testAsymmetricSignatureSP11() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -578,7 +578,7 @@ public class StaxX509TokenTest extends A
     public void testAsymmetricEncryption() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -606,7 +606,7 @@ public class StaxX509TokenTest extends A
     public void testAsymmetricSignatureReplay() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -642,7 +642,7 @@ public class StaxX509TokenTest extends A
     public void testTransportSupportingSigned() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -672,7 +672,7 @@ public class StaxX509TokenTest extends A
     public void testTransportSupportingSignedCertConstraints() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -710,7 +710,7 @@ public class StaxX509TokenTest extends A
     public void testTransportKVT() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -738,7 +738,7 @@ public class StaxX509TokenTest extends A
     public void testKeyIdentifier2() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -772,7 +772,7 @@ public class StaxX509TokenTest extends A
     public void testSupportingToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -821,7 +821,7 @@ public class StaxX509TokenTest extends A
     public void testNegativeEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxX509TokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java Tue Jul  9 10:07:29 2013
@@ -79,7 +79,7 @@ public class X509TokenTest extends Abstr
     public void testKeyIdentifier() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -107,7 +107,7 @@ public class X509TokenTest extends Abstr
     public void testKeyIdentifierJaxwsClient() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/jaxws-client.xml");
+        URL busFile = X509TokenTest.class.getResource("jaxws-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -139,7 +139,7 @@ public class X509TokenTest extends Abstr
     public void testIntermediary() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/intermediary-client.xml");
+        URL busFile = X509TokenTest.class.getResource("intermediary-client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -167,7 +167,7 @@ public class X509TokenTest extends Abstr
     public void testIssuerSerial() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -195,7 +195,7 @@ public class X509TokenTest extends Abstr
     public void testThumbprint() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -223,7 +223,7 @@ public class X509TokenTest extends Abstr
     public void testContentEncryptedElements() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -247,7 +247,7 @@ public class X509TokenTest extends Abstr
     public void testAsymmetricIssuerSerial() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -275,7 +275,7 @@ public class X509TokenTest extends Abstr
     public void testAsymmetricThumbprint() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -303,7 +303,7 @@ public class X509TokenTest extends Abstr
     public void testAsymmetricEncryptBeforeSigning() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -331,7 +331,7 @@ public class X509TokenTest extends Abstr
     public void testAsymmetricEncryptSignature() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -359,7 +359,7 @@ public class X509TokenTest extends Abstr
     public void testAsymmetricProtectTokens() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -387,7 +387,7 @@ public class X509TokenTest extends Abstr
     public void testAsymmetricUsernameToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -415,7 +415,7 @@ public class X509TokenTest extends Abstr
     public void testSymmetricProtectTokens() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -443,7 +443,7 @@ public class X509TokenTest extends Abstr
     public void testTransportEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -471,7 +471,7 @@ public class X509TokenTest extends Abstr
     public void testTransportEndorsingSP11() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -499,7 +499,7 @@ public class X509TokenTest extends Abstr
     public void testTransportSignedEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -527,7 +527,7 @@ public class X509TokenTest extends Abstr
     public void testTransportEndorsingEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -555,7 +555,7 @@ public class X509TokenTest extends Abstr
     public void testTransportSignedEndorsingEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -583,7 +583,7 @@ public class X509TokenTest extends Abstr
     public void testAsymmetricSignature() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -611,7 +611,7 @@ public class X509TokenTest extends Abstr
     public void testAsymmetricSignatureSP11() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -639,7 +639,7 @@ public class X509TokenTest extends Abstr
     public void testAsymmetricEncryption() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -667,7 +667,7 @@ public class X509TokenTest extends Abstr
     public void testAsymmetricSignatureReplay() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -703,7 +703,7 @@ public class X509TokenTest extends Abstr
     public void testTransportSupportingSigned() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -731,7 +731,7 @@ public class X509TokenTest extends Abstr
     public void testTransportSupportingSignedCertConstraints() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -769,7 +769,7 @@ public class X509TokenTest extends Abstr
     public void testTransportKVT() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -797,7 +797,7 @@ public class X509TokenTest extends Abstr
     public void testKeyIdentifier2() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -830,7 +830,7 @@ public class X509TokenTest extends Abstr
     public void testSupportingToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -879,7 +879,7 @@ public class X509TokenTest extends Abstr
     public void testNegativeEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client/client.xml");
+        URL busFile = X509TokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/javafirstclient.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/javafirstclient.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/sslcertclient.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/sslcertclient.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/sslnocertclient.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/sslnocertclient.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/endorsing-client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/endorsing-client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client-derived.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client-derived.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/policy-client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/policy-client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml (from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client.xml&r1=1501165&r2=1501177&rev=1501177&view=diff
==============================================================================
    (empty)



Mime
View raw message