cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1501700 - in /cxf/trunk/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/coverage_checker/ java/org/apache/cxf/systest/ws/wssec10/ java/org/apache/cxf/systest/ws/wssec10/server/ java/org/apache/cxf/systest/ws/wssec11/server/ r...
Date Wed, 10 Jul 2013 09:58:07 GMT
Author: coheigea
Date: Wed Jul 10 09:58:06 2013
New Revision: 1501700

URL: http://svn.apache.org/r1501700
Log:
Fixing failing tests with restricted security jars

Added:
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
      - copied, changed from r1501640, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml
      - copied, changed from r1501640, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml
      - copied, changed from r1501640, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized_2.xml
      - copied, changed from r1501640, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml
      - copied, changed from r1501640, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml
      - copied, changed from r1501640, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server_restricted.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/server.xml
      - copied, changed from r1501640, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/server/server.xml
Removed:
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server_restricted.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/server/server.xml
Modified:
    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/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/server/AuthorizedServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java
    cxf/trunk/systests/ws-security/src/test/resources/restricted/alice.properties
    cxf/trunk/systests/ws-security/src/test/resources/restricted/bob.properties

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=1501700&r1=1501699&r2=1501700&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
Wed Jul 10 09:58:06 2013
@@ -44,6 +44,12 @@ public class DefaultCryptoCoverageChecke
 
     private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
     private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
+    
+    private static boolean unrestrictedPoliciesInstalled;
+    
+    static {
+        unrestrictedPoliciesInstalled = SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
+    };    
 
     @BeforeClass
     public static void startServers() throws Exception {
@@ -357,6 +363,10 @@ public class DefaultCryptoCoverageChecke
     
     @org.junit.Test
     public void testSignedEncryptedBody() throws Exception {
+        
+        if (!unrestrictedPoliciesInstalled) {
+            return;
+        }
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client.xml");
 

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=1501700&r1=1501699&r2=1501700&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
Wed Jul 10 09:58:06 2013
@@ -45,6 +45,12 @@ public class StaxCryptoCoverageCheckerTe
     private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
     private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
 
+    private static boolean unrestrictedPoliciesInstalled;
+    
+    static {
+        unrestrictedPoliciesInstalled = SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
+    };    
+    
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue(
@@ -357,6 +363,11 @@ public class StaxCryptoCoverageCheckerTe
     
     @org.junit.Test
     public void testSignedEncryptedBody() throws Exception {
+        
+        if (!unrestrictedPoliciesInstalled) {
+            return;
+        }
+        
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = StaxCryptoCoverageCheckerTest.class.getResource("client.xml");
 

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=1501700&r1=1501699&r2=1501700&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
Wed Jul 10 09:58:06 2013
@@ -90,7 +90,7 @@ public class StaxWSSecurity10Test extend
             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");
+                    "org/apache/cxf/systest/ws/wssec10/client_restricted.xml");
         }
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);
@@ -141,7 +141,7 @@ public class StaxWSSecurity10Test extend
             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");
+                    "org/apache/cxf/systest/ws/wssec10/client_restricted.xml");
         }
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);

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=1501700&r1=1501699&r2=1501700&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
Wed Jul 10 09:58:06 2013
@@ -90,7 +90,7 @@ public class WSSecurity10Test extends Ab
             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");
+                    "org/apache/cxf/systest/ws/wssec10/client_restricted.xml");
         }
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);
@@ -141,7 +141,7 @@ public class WSSecurity10Test extends Ab
             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");
+                    "org/apache/cxf/systest/ws/wssec10/client_restricted.xml");
         }
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java?rev=1501700&r1=1501699&r2=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java
Wed Jul 10 09:58:06 2013
@@ -27,7 +27,7 @@ public class AuthorizedServer extends Ab
     static final String PORT = allocatePort(AuthorizedServer.class);
 
     private static String configFileName =
-        "org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml";
+        "org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml";
     
     public AuthorizedServer() throws Exception {
         

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java?rev=1501700&r1=1501699&r2=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java
Wed Jul 10 09:58:06 2013
@@ -27,7 +27,7 @@ public class AuthorizedServer2 extends A
     static final String PORT = allocatePort(AuthorizedServer2.class);
 
     private static String configFileName =
-        "org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml";
+        "org/apache/cxf/systest/ws/wssec10/server_restricted_authorized_2.xml";
     
     public AuthorizedServer2() throws Exception {
         

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java?rev=1501700&r1=1501699&r2=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java
Wed Jul 10 09:58:06 2013
@@ -34,9 +34,9 @@ public class Server extends AbstractBusT
     static {
         unrestrictedPoliciesInstalled = SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
         if (unrestrictedPoliciesInstalled) {
-            configFileName = "org/apache/cxf/systest/ws/wssec10/server/server.xml";
+            configFileName = "org/apache/cxf/systest/ws/wssec10/server.xml";
         } else {
-            configFileName = "org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml";
+            configFileName = "org/apache/cxf/systest/ws/wssec10/server_restricted.xml";
         }
     };    
 

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServer.java?rev=1501700&r1=1501699&r2=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServer.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServer.java
Wed Jul 10 09:58:06 2013
@@ -34,9 +34,9 @@ public class StaxServer extends Abstract
     static {
         unrestrictedPoliciesInstalled = SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
         if (unrestrictedPoliciesInstalled) {
-            configFileName = "org/apache/cxf/systest/ws/wssec10/server/stax-server.xml";
+            configFileName = "org/apache/cxf/systest/ws/wssec10/stax-server.xml";
         } else {
-            configFileName = "org/apache/cxf/systest/ws/wssec10/server/stax-server_restricted.xml";
+            configFileName = "org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml";
         }
     };    
 

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java?rev=1501700&r1=1501699&r2=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java
Wed Jul 10 09:58:06 2013
@@ -33,7 +33,7 @@ abstract class AbstractServerRestricted 
     
     protected AbstractServerRestricted(String baseUrl) throws Exception {
         
-        Bus bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/server/server.xml");
+        Bus bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/server.xml");
         new RestrictedAlgorithmSuiteLoader(bus);
         BusFactory.setDefaultBus(bus);
         setBus(bus);
@@ -60,8 +60,7 @@ abstract class AbstractServerRestricted 
     private void doPublish(String url, Object obj) {
         Endpoint ep = Endpoint.create(obj);
         ep.getProperties().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
-        ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES, 
-                "org/apache/cxf/systest/ws/wssec11/server/restricted/bob.properties");
+        ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES, "restricted/bob.properties");
         ep.publish(url);
     }
     

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java?rev=1501700&r1=1501699&r2=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java
Wed Jul 10 09:58:06 2013
@@ -35,7 +35,7 @@ public class Server11 extends AbstractSe
     
     protected void run()  {
         Bus busLocal = new SpringBusFactory().createBus(
-            "org/apache/cxf/systest/ws/wssec11/server/server.xml");
+            "org/apache/cxf/systest/ws/wssec11/server.xml");
         BusFactory.setDefaultBus(busLocal);
         setBus(busLocal);
         super.run();

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java?rev=1501700&r1=1501699&r2=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
Wed Jul 10 09:58:06 2013
@@ -35,7 +35,7 @@ public class Server11Restricted extends 
     
     protected void run()  {
         Bus busLocal = new SpringBusFactory().createBus(
-            "org/apache/cxf/systest/ws/wssec11/server/server.xml");
+            "org/apache/cxf/systest/ws/wssec11/server.xml");
         BusFactory.setDefaultBus(busLocal);
         setBus(busLocal);
 

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java?rev=1501700&r1=1501699&r2=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java
Wed Jul 10 09:58:06 2013
@@ -35,7 +35,7 @@ public class Server12 extends AbstractSe
     
     protected void run()  {
         Bus busLocal = new SpringBusFactory().createBus(
-            "org/apache/cxf/systest/ws/wssec11/server/server.xml");
+            "org/apache/cxf/systest/ws/wssec11/server.xml");
         BusFactory.setDefaultBus(busLocal);
         setBus(busLocal);
         super.run();

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java?rev=1501700&r1=1501699&r2=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java
Wed Jul 10 09:58:06 2013
@@ -35,7 +35,7 @@ public class Server12Restricted extends 
     
     protected void run()  {
         Bus busLocal = new SpringBusFactory().createBus(
-            "org/apache/cxf/systest/ws/wssec11/server/server.xml");
+            "org/apache/cxf/systest/ws/wssec11/server.xml");
         BusFactory.setDefaultBus(busLocal);
         setBus(busLocal);
 

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

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml
(from r1501640, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml&r1=1501640&r2=1501700&rev=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
(original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml
Wed Jul 10 09:58:06 2013
@@ -52,10 +52,10 @@
         <httpj:engine port="${testutil.ports.Server.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="restricted/bob.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="restricted/alice.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/restricted/alice.jks"/>
                 </sec:trustManagers> 
 
                 <sec:cipherSuitesFilter>

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

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

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

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml
(from r1501640, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server_restricted.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server_restricted.xml&r1=1501640&r2=1501700&rev=1501700&view=diff
==============================================================================
    (empty)

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

Modified: cxf/trunk/systests/ws-security/src/test/resources/restricted/alice.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/restricted/alice.properties?rev=1501700&r1=1501699&r2=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/restricted/alice.properties (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/restricted/alice.properties Wed Jul
10 09:58:06 2013
@@ -18,4 +18,4 @@ org.apache.ws.security.crypto.provider=o
 org.apache.ws.security.crypto.merlin.keystore.type=jks
 org.apache.ws.security.crypto.merlin.keystore.password=password
 org.apache.ws.security.crypto.merlin.keystore.alias=alice
-org.apache.ws.security.crypto.merlin.keystore.file=../certs/restricted/alice.jks
+org.apache.ws.security.crypto.merlin.keystore.file=certs/restricted/alice.jks

Modified: cxf/trunk/systests/ws-security/src/test/resources/restricted/bob.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/restricted/bob.properties?rev=1501700&r1=1501699&r2=1501700&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/restricted/bob.properties (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/restricted/bob.properties Wed Jul 10
09:58:06 2013
@@ -18,4 +18,4 @@ org.apache.ws.security.crypto.provider=o
 org.apache.ws.security.crypto.merlin.keystore.type=jks
 org.apache.ws.security.crypto.merlin.keystore.password=password
 org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.keystore.file=../certs/restricted/bob.jks
+org.apache.ws.security.crypto.merlin.keystore.file=certs/restricted/bob.jks



Mime
View raw message