cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1501177 [1/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
Author: coheigea
Date: Tue Jul  9 10:07:29 2013
New Revision: 1501177

URL: http://svn.apache.org/r1501177
Log:
Security systest refactor - part IV

Added:
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/javafirstclient.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/sslcertclient.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/sslnocertclient.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/endorsing-client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client-derived.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/policy-client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client_restricted.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client_restricted.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary-client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/intermediary-client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/jaxws-client.xml
      - copied, changed from r1501165, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/jaxws-client.xml
Removed:
    cxf/trunk/systests/ws-security/src/test/resources/certs/client/alice.jks
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/javafirstclient.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/sslcertclient.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/sslnocertclient.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/endorsing-client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client-derived.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/policy-client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client_restricted.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/intermediary-client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/jaxws-client.xml
Modified:
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxGCMTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxHttpsTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxUsernameTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/StaxWSSecurity10Test.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java Tue Jul  9 10:07:29 2013
@@ -60,7 +60,7 @@ public class ActionTest extends Abstract
     public void test3DESEncryptionGivenKey() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = ActionTest.class.getResource("client/client.xml");
+        URL busFile = ActionTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -82,7 +82,7 @@ public class ActionTest extends Abstract
     public void testUsernameToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = ActionTest.class.getResource("client/client.xml");
+        URL busFile = ActionTest.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/algsuite/AlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java Tue Jul  9 10:07:29 2013
@@ -64,7 +64,7 @@ public class AlgorithmSuiteTest extends 
     public void testSecurityPolicy() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = AlgorithmSuiteTest.class.getResource("client/client.xml");
+        URL busFile = AlgorithmSuiteTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -145,7 +145,7 @@ public class AlgorithmSuiteTest extends 
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = AlgorithmSuiteTest.class.getResource("client/client.xml");
+        URL busFile = AlgorithmSuiteTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -174,7 +174,7 @@ public class AlgorithmSuiteTest extends 
     public void testManualConfigurationEncryption() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = AlgorithmSuiteTest.class.getResource("client/client.xml");
+        URL busFile = AlgorithmSuiteTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -224,7 +224,7 @@ public class AlgorithmSuiteTest extends 
     public void testManualConfigurationSignature() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = AlgorithmSuiteTest.class.getResource("client/client.xml");
+        URL busFile = AlgorithmSuiteTest.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/algsuite/StaxAlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java Tue Jul  9 10:07:29 2013
@@ -64,7 +64,7 @@ public class StaxAlgorithmSuiteTest exte
     public void testSecurityPolicy() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxAlgorithmSuiteTest.class.getResource("client/client.xml");
+        URL busFile = StaxAlgorithmSuiteTest.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/bindings/BindingPropertiesTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java Tue Jul  9 10:07:29 2013
@@ -63,7 +63,7 @@ public class BindingPropertiesTest exten
     public void testOnlySignEntireHeadersAndBody() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = BindingPropertiesTest.class.getResource("client/client.xml");
+        URL busFile = BindingPropertiesTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -99,7 +99,7 @@ public class BindingPropertiesTest exten
     public void testEncryptSignature() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = BindingPropertiesTest.class.getResource("client/client.xml");
+        URL busFile = BindingPropertiesTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -135,7 +135,7 @@ public class BindingPropertiesTest exten
     public void testIncludeTimestamp() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = BindingPropertiesTest.class.getResource("client/client.xml");
+        URL busFile = BindingPropertiesTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -171,7 +171,7 @@ public class BindingPropertiesTest exten
     public void testEncryptBeforeSigning() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = BindingPropertiesTest.class.getResource("client/client.xml");
+        URL busFile = BindingPropertiesTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -207,7 +207,7 @@ public class BindingPropertiesTest exten
     public void testSignBeforeEncrypting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = BindingPropertiesTest.class.getResource("client/client.xml");
+        URL busFile = BindingPropertiesTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -245,7 +245,7 @@ public class BindingPropertiesTest exten
     public void testTimestampFirst() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = BindingPropertiesTest.class.getResource("client/client.xml");
+        URL busFile = BindingPropertiesTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -281,7 +281,7 @@ public class BindingPropertiesTest exten
     public void testTimestampLast() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = BindingPropertiesTest.class.getResource("client/client.xml");
+        URL busFile = BindingPropertiesTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -317,7 +317,7 @@ public class BindingPropertiesTest exten
     public void testStrict() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = BindingPropertiesTest.class.getResource("client/client.xml");
+        URL busFile = BindingPropertiesTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -355,7 +355,7 @@ public class BindingPropertiesTest exten
     public void testTokenProtection() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = BindingPropertiesTest.class.getResource("client/client.xml");
+        URL busFile = BindingPropertiesTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -393,7 +393,7 @@ public class BindingPropertiesTest exten
     public void testSignatureConfirmation() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = BindingPropertiesTest.class.getResource("client/client.xml");
+        URL busFile = BindingPropertiesTest.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/coverage_checker/DefaultCryptoCoverageCheckerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java Tue Jul  9 10:07:29 2013
@@ -64,7 +64,7 @@ public class DefaultCryptoCoverageChecke
     @org.junit.Test
     public void testSignedBodyTimestamp() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -106,7 +106,7 @@ public class DefaultCryptoCoverageChecke
     @org.junit.Test
     public void testSignedBodyOnly() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -158,7 +158,7 @@ public class DefaultCryptoCoverageChecke
     @org.junit.Test
     public void testSignedTimestampOnly() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -211,7 +211,7 @@ public class DefaultCryptoCoverageChecke
     @org.junit.Test
     public void testSignedBodyTimestampSoap12() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -253,7 +253,7 @@ public class DefaultCryptoCoverageChecke
     @org.junit.Test
     public void testSignedBodyOnlySoap12() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -305,7 +305,7 @@ public class DefaultCryptoCoverageChecke
     @org.junit.Test
     public void testSignedTimestampOnlySoap12() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -358,7 +358,7 @@ public class DefaultCryptoCoverageChecke
     @org.junit.Test
     public void testSignedEncryptedBody() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -402,7 +402,7 @@ public class DefaultCryptoCoverageChecke
     @org.junit.Test
     public void testSignedNotEncryptedBody() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -459,7 +459,7 @@ public class DefaultCryptoCoverageChecke
     @org.junit.Test
     public void testWSAddressing() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -537,7 +537,7 @@ public class DefaultCryptoCoverageChecke
     @org.junit.Test
     public void testClientChecker() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -569,7 +569,7 @@ public class DefaultCryptoCoverageChecke
     @org.junit.Test
     public void testClientChecker2() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = DefaultCryptoCoverageCheckerTest.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/coverage_checker/StaxCryptoCoverageCheckerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java Tue Jul  9 10:07:29 2013
@@ -64,7 +64,7 @@ public class StaxCryptoCoverageCheckerTe
     @org.junit.Test
     public void testSignedBodyTimestamp() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -106,7 +106,7 @@ public class StaxCryptoCoverageCheckerTe
     @org.junit.Test
     public void testSignedBodyOnly() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -158,7 +158,7 @@ public class StaxCryptoCoverageCheckerTe
     @org.junit.Test
     public void testSignedTimestampOnly() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -211,7 +211,7 @@ public class StaxCryptoCoverageCheckerTe
     @org.junit.Test
     public void testSignedBodyTimestampSoap12() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -253,7 +253,7 @@ public class StaxCryptoCoverageCheckerTe
     @org.junit.Test
     public void testSignedBodyOnlySoap12() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -305,7 +305,7 @@ public class StaxCryptoCoverageCheckerTe
     @org.junit.Test
     public void testSignedTimestampOnlySoap12() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -358,7 +358,7 @@ public class StaxCryptoCoverageCheckerTe
     @org.junit.Test
     public void testSignedEncryptedBody() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -402,7 +402,7 @@ public class StaxCryptoCoverageCheckerTe
     @org.junit.Test
     public void testSignedNotEncryptedBody() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -459,7 +459,7 @@ public class StaxCryptoCoverageCheckerTe
     @org.junit.Test
     public void testWSAddressing() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client/client.xml");
+        URL busFile = StaxCryptoCoverageCheckerTest.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/fault/FaultTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java Tue Jul  9 10:07:29 2013
@@ -72,7 +72,7 @@ public class FaultTest extends AbstractB
     public void testSoap11() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = FaultTest.class.getResource("client/client.xml");
+        URL busFile = FaultTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -105,7 +105,7 @@ public class FaultTest extends AbstractB
     @org.junit.Test
     public void testSoap12() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = FaultTest.class.getResource("client/client.xml");
+        URL busFile = FaultTest.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/gcm/GCMTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java Tue Jul  9 10:07:29 2013
@@ -75,7 +75,7 @@ public class GCMTest extends AbstractBus
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = GCMTest.class.getResource("client/client.xml");
+        URL busFile = GCMTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -118,7 +118,7 @@ public class GCMTest extends AbstractBus
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = GCMTest.class.getResource("client/client.xml");
+        URL busFile = GCMTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -161,7 +161,7 @@ public class GCMTest extends AbstractBus
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = GCMTest.class.getResource("client/client.xml");
+        URL busFile = GCMTest.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/gcm/StaxGCMTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxGCMTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxGCMTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxGCMTest.java Tue Jul  9 10:07:29 2013
@@ -75,7 +75,7 @@ public class StaxGCMTest extends Abstrac
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxGCMTest.class.getResource("client/client.xml");
+        URL busFile = StaxGCMTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -118,7 +118,7 @@ public class StaxGCMTest extends Abstrac
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxGCMTest.class.getResource("client/client.xml");
+        URL busFile = StaxGCMTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -161,7 +161,7 @@ public class StaxGCMTest extends Abstrac
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxGCMTest.class.getResource("client/client.xml");
+        URL busFile = StaxGCMTest.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/httpget/HTTPGetTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java Tue Jul  9 10:07:29 2013
@@ -73,7 +73,7 @@ public class HTTPGetTest extends Abstrac
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = HTTPGetTest.class.getResource("client/client.xml");
+        URL busFile = HTTPGetTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -98,7 +98,7 @@ public class HTTPGetTest extends Abstrac
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = HTTPGetTest.class.getResource("client/client.xml");
+        URL busFile = HTTPGetTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -125,7 +125,7 @@ public class HTTPGetTest extends Abstrac
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = HTTPGetTest.class.getResource("client/client.xml");
+        URL busFile = HTTPGetTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -164,7 +164,7 @@ public class HTTPGetTest extends Abstrac
         }
         
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = HTTPGetTest.class.getResource("client/client.xml");
+        URL busFile = HTTPGetTest.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/https/HttpsTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java Tue Jul  9 10:07:29 2013
@@ -61,7 +61,7 @@ public class HttpsTokenTest extends Abst
     public void testRequireClientCert() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = HttpsTokenTest.class.getResource("client/client.xml");
+        URL busFile = HttpsTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -112,7 +112,7 @@ public class HttpsTokenTest extends Abst
     public void testBasicAuth() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = HttpsTokenTest.class.getResource("client/client.xml");
+        URL busFile = HttpsTokenTest.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/https/StaxHttpsTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxHttpsTokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxHttpsTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxHttpsTokenTest.java Tue Jul  9 10:07:29 2013
@@ -61,7 +61,7 @@ public class StaxHttpsTokenTest extends 
     public void testRequireClientCert() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxHttpsTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxHttpsTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -111,7 +111,7 @@ public class StaxHttpsTokenTest extends 
     public void testBasicAuth() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxHttpsTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxHttpsTokenTest.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/kerberos/KerberosTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java Tue Jul  9 10:07:29 2013
@@ -77,7 +77,7 @@ public class KerberosTokenTest extends A
     public void testKerberosOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -110,7 +110,7 @@ public class KerberosTokenTest extends A
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -143,7 +143,7 @@ public class KerberosTokenTest extends A
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -176,7 +176,7 @@ public class KerberosTokenTest extends A
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -209,7 +209,7 @@ public class KerberosTokenTest extends A
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -238,7 +238,7 @@ public class KerberosTokenTest extends A
     public void testKerberosOverTransportEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -267,7 +267,7 @@ public class KerberosTokenTest extends A
     public void testKerberosOverAsymmetricEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -291,7 +291,7 @@ public class KerberosTokenTest extends A
     public void testKerberosOverSymmetricProtection() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -320,7 +320,7 @@ public class KerberosTokenTest extends A
     public void testKerberosOverSymmetricDerivedProtection() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -353,7 +353,7 @@ public class KerberosTokenTest extends A
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -382,7 +382,7 @@ public class KerberosTokenTest extends A
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -415,7 +415,7 @@ public class KerberosTokenTest extends A
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -448,7 +448,7 @@ public class KerberosTokenTest extends A
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.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/kerberos/StaxKerberosTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java Tue Jul  9 10:07:29 2013
@@ -77,7 +77,7 @@ public class StaxKerberosTokenTest exten
     public void testKerberosOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -110,7 +110,7 @@ public class StaxKerberosTokenTest exten
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -143,7 +143,7 @@ public class StaxKerberosTokenTest exten
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -176,7 +176,7 @@ public class StaxKerberosTokenTest exten
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = KerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -209,7 +209,7 @@ public class StaxKerberosTokenTest exten
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -238,7 +238,7 @@ public class StaxKerberosTokenTest exten
     public void testKerberosOverTransportEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -267,7 +267,7 @@ public class StaxKerberosTokenTest exten
     public void testKerberosOverAsymmetricEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -296,7 +296,7 @@ public class StaxKerberosTokenTest exten
     public void testKerberosOverSymmetricProtection() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -325,7 +325,7 @@ public class StaxKerberosTokenTest exten
     public void testKerberosOverSymmetricDerivedProtection() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -354,7 +354,7 @@ public class StaxKerberosTokenTest exten
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -387,7 +387,7 @@ public class StaxKerberosTokenTest exten
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -420,7 +420,7 @@ public class StaxKerberosTokenTest exten
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -449,7 +449,7 @@ public class StaxKerberosTokenTest exten
         }
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = StaxKerberosTokenTest.class.getResource("client/client.xml");
+        URL busFile = StaxKerberosTokenTest.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/parts/PartsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java Tue Jul  9 10:07:29 2013
@@ -62,7 +62,7 @@ public class PartsTest extends AbstractB
     public void testRequiredParts() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PartsTest.class.getResource("client/client.xml");
+        URL busFile = PartsTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -98,7 +98,7 @@ public class PartsTest extends AbstractB
     public void testRequiredElements() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PartsTest.class.getResource("client/client.xml");
+        URL busFile = PartsTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -134,7 +134,7 @@ public class PartsTest extends AbstractB
     public void testSignedParts() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PartsTest.class.getResource("client/client.xml");
+        URL busFile = PartsTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -183,7 +183,7 @@ public class PartsTest extends AbstractB
     public void testSignedElements() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PartsTest.class.getResource("client/client.xml");
+        URL busFile = PartsTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -219,7 +219,7 @@ public class PartsTest extends AbstractB
     public void testEncryptedParts() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PartsTest.class.getResource("client/client.xml");
+        URL busFile = PartsTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -268,7 +268,7 @@ public class PartsTest extends AbstractB
     public void testEncryptedElements() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PartsTest.class.getResource("client/client.xml");
+        URL busFile = PartsTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -304,7 +304,7 @@ public class PartsTest extends AbstractB
     public void testContentEncryptedElements() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PartsTest.class.getResource("client/client.xml");
+        URL busFile = PartsTest.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/policy/JavaFirstPolicyServiceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java Tue Jul  9 10:07:29 2013
@@ -79,7 +79,7 @@ public class JavaFirstPolicyServiceTest 
         System.setProperty("testutil.ports.JavaFirstPolicyServer", PORT);
 
         ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(
-            "org/apache/cxf/systest/ws/policy/client/javafirstclient.xml");
+            "org/apache/cxf/systest/ws/policy/javafirstclient.xml");
 
         JavaFirstAttachmentPolicyService svc = ctx.getBean("JavaFirstAttachmentPolicyServiceClient",
                                                            JavaFirstAttachmentPolicyService.class);
@@ -113,7 +113,7 @@ public class JavaFirstPolicyServiceTest 
         System.setProperty("testutil.ports.JavaFirstPolicyServer.2", PORT2);
 
         ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(
-            "org/apache/cxf/systest/ws/policy/client/javafirstclient.xml");
+            "org/apache/cxf/systest/ws/policy/javafirstclient.xml");
 
         SslUsernamePasswordAttachmentService svc = ctx.getBean("SslUsernamePasswordAttachmentServiceClient",
                                                                SslUsernamePasswordAttachmentService.class);
@@ -147,7 +147,7 @@ public class JavaFirstPolicyServiceTest 
         System.setProperty("testutil.ports.JavaFirstPolicyServer", PORT);
 
         ClassPathXmlApplicationContext clientContext = new ClassPathXmlApplicationContext(new String[] {
-            "org/apache/cxf/systest/ws/policy/client/sslnocertclient.xml"
+            "org/apache/cxf/systest/ws/policy/sslnocertclient.xml"
         });
 
         BindingSimpleService simpleService = clientContext.getBean("BindingSimpleServiceClient",
@@ -179,7 +179,7 @@ public class JavaFirstPolicyServiceTest 
         System.setProperty("testutil.ports.JavaFirstPolicyServer.3", PORT3);
 
         ClassPathXmlApplicationContext clientContext = new ClassPathXmlApplicationContext(new String[] {
-            "org/apache/cxf/systest/ws/policy/client/sslcertclient.xml"
+            "org/apache/cxf/systest/ws/policy/sslcertclient.xml"
         });
 
         BindingSimpleService simpleService = clientContext.getBean("BindingSimpleServiceClient",
@@ -208,7 +208,7 @@ public class JavaFirstPolicyServiceTest 
         System.setProperty("testutil.ports.JavaFirstPolicyServer.3", PORT3);
 
         ClassPathXmlApplicationContext clientContext = new ClassPathXmlApplicationContext(new String[] {
-            "org/apache/cxf/systest/ws/policy/client/sslnocertclient.xml"
+            "org/apache/cxf/systest/ws/policy/sslnocertclient.xml"
         });
 
         NoAlternativesOperationSimpleService simpleService = clientContext
@@ -257,7 +257,7 @@ public class JavaFirstPolicyServiceTest 
         System.setProperty("testutil.ports.JavaFirstPolicyServer.3", PORT3);
 
         ClassPathXmlApplicationContext clientContext = new ClassPathXmlApplicationContext(new String[] {
-            "org/apache/cxf/systest/ws/policy/client/sslcertclient.xml"
+            "org/apache/cxf/systest/ws/policy/sslcertclient.xml"
         });
 
         NoAlternativesOperationSimpleService simpleService = clientContext
@@ -301,7 +301,7 @@ public class JavaFirstPolicyServiceTest 
         System.setProperty("testutil.ports.JavaFirstPolicyServer.3", PORT3);
 
         ClassPathXmlApplicationContext clientContext = new ClassPathXmlApplicationContext(new String[] {
-            "org/apache/cxf/systest/ws/policy/client/sslnocertclient.xml"
+            "org/apache/cxf/systest/ws/policy/sslnocertclient.xml"
         });
 
         OperationSimpleService simpleService = clientContext
@@ -337,7 +337,7 @@ public class JavaFirstPolicyServiceTest 
         System.setProperty("testutil.ports.JavaFirstPolicyServer.3", PORT3);
 
         ClassPathXmlApplicationContext clientContext = new ClassPathXmlApplicationContext(new String[] {
-            "org/apache/cxf/systest/ws/policy/client/sslcertclient.xml"
+            "org/apache/cxf/systest/ws/policy/sslcertclient.xml"
         });
 
         OperationSimpleService simpleService = clientContext

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java Tue Jul  9 10:07:29 2013
@@ -68,7 +68,7 @@ public class PolicyAlternativeTest exten
     public void testAsymmetric() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PolicyAlternativeTest.class.getResource("client/client.xml");
+        URL busFile = PolicyAlternativeTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -99,7 +99,7 @@ public class PolicyAlternativeTest exten
     public void testNoSecurity() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PolicyAlternativeTest.class.getResource("client/client.xml");
+        URL busFile = PolicyAlternativeTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -140,7 +140,7 @@ public class PolicyAlternativeTest exten
     public void testUsernameToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PolicyAlternativeTest.class.getResource("client/client.xml");
+        URL busFile = PolicyAlternativeTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -172,7 +172,7 @@ public class PolicyAlternativeTest exten
     @org.junit.Test
     public void testRequireClientCertToken() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PolicyAlternativeTest.class.getResource("client/client.xml");
+        URL busFile = PolicyAlternativeTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -214,7 +214,7 @@ public class PolicyAlternativeTest exten
     public void testTransportSupportingSigned() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PolicyAlternativeTest.class.getResource("client/client.xml");
+        URL busFile = PolicyAlternativeTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -257,7 +257,7 @@ public class PolicyAlternativeTest exten
     public void testTransportUTSupportingSigned() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = PolicyAlternativeTest.class.getResource("client/client.xml");
+        URL busFile = PolicyAlternativeTest.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/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java?rev=1501177&r1=1501176&r2=1501177&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java Tue Jul  9 10:07:29 2013
@@ -68,7 +68,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml1OverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -129,7 +129,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml1OverTransportStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -192,7 +192,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml1Supporting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -225,7 +225,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml1ElementOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -259,7 +259,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml1ElementOverTransportStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -294,7 +294,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2OverSymmetric() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -351,7 +351,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2OverSymmetricStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -412,7 +412,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2OverSymmetricSupporting() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -444,7 +444,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2OverAsymmetric() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -505,7 +505,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2OverAsymmetricStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -568,7 +568,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml1SelfSignedOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -595,7 +595,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml1SelfSignedOverTransportStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -623,7 +623,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml1SelfSignedOverTransportSP11() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -650,7 +650,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml1SelfSignedOverTransportSP11Streaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -678,7 +678,7 @@ public class SamlTokenTest extends Abstr
     public void testAsymmetricSamlInitiator() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -707,7 +707,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2OverSymmetricSignedElements() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -734,7 +734,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2EndorsingOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -764,7 +764,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2EndorsingOverTransportStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -795,7 +795,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2EndorsingPKOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -826,7 +826,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2EndorsingPKOverTransportStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -858,7 +858,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2EndorsingOverTransportSP11() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -888,7 +888,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2EndorsingOverTransportSP11Streaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -919,7 +919,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2OverAsymmetricSignedEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -946,7 +946,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2OverAsymmetricSignedEncryptedStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -974,7 +974,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2OverAsymmetricEncrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -1003,7 +1003,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2OverAsymmetricEncryptedStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -1033,7 +1033,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2EndorsingEncryptedOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -1063,7 +1063,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2EndorsingEncryptedOverTransportStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -1094,7 +1094,7 @@ public class SamlTokenTest extends Abstr
     public void testNoSamlToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -1123,7 +1123,7 @@ public class SamlTokenTest extends Abstr
     public void testNoSamlTokenStreaming() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -1155,7 +1155,7 @@ public class SamlTokenTest extends Abstr
     public void testSaml2PEP() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SamlTokenTest.class.getResource("client/client.xml");
+        URL busFile = SamlTokenTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);



Mime
View raw message