cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1500684 [1/4] - in /cxf/trunk/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/common/ java/org/apache/cxf/systest/ws/coverage_checker/ java/org/apache/cxf/systest/ws/fault/ java/org/apache/cxf/systest/ws/httpget/ java/org/apa...
Date Mon, 08 Jul 2013 12:13:24 GMT
Author: coheigea
Date: Mon Jul  8 12:13:23 2013
New Revision: 1500684

URL: http://svn.apache.org/r1500684
Log:
Security systest refactor part I - Use common CallbackHandler implementations

Added:
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java
      - copied, changed from r1500669, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/UTPasswordCallback.java
      - copied, changed from r1500669, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java
Removed:
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/KeystorePasswordCallback.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/KeystorePasswordCallback.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/KeystorePasswordCallback.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/UTPasswordCallback.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/KeystorePasswordCallback.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/KeystorePasswordCallback.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java
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/fault/FaultTest.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/policy/JavaFirstPolicyServiceTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.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/resources/org/apache/cxf/systest/ws/action/client/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.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/algsuite/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/stax-server.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/bindings/server/server.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/coverage_checker/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/stax-server.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/fault/server/server.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/gcm/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server/server.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/kerberos/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/stax-server.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/parts/server/server.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/server/javafirstserver.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.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/saml/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/client.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.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/tokens/server/endorsing-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/server.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/ut/server/policy-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server-derived.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/stax-server.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/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/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/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/stax-server.xml

Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java (from r1500669, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java&r1=1500669&r2=1500684&rev=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java Mon Jul  8 12:13:23 2013
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.systest.ws.wssec11.server;
 
- 
+package org.apache.cxf.systest.ws.common;
+
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -30,8 +30,8 @@ import javax.security.auth.callback.Unsu
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 /**
+ * A CallbackHandler implementation for keystores.
  */
-
 public class KeystorePasswordCallback implements CallbackHandler {
     
     private Map<String, String> passwords = 
@@ -43,6 +43,8 @@ public class KeystorePasswordCallback im
         passwords.put("Bob", "abcd!1234");
         passwords.put("bob", "password");
         passwords.put("abcd", "dcba");
+        passwords.put("6e0e88f36ebb8744d470f62f604d03ea4ebe5094", "password");
+        passwords.put("wss40rev", "security");
     }
 
     /**
@@ -52,19 +54,15 @@ public class KeystorePasswordCallback im
     public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
         for (int i = 0; i < callbacks.length; i++) {
             WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
-
             String pass = passwords.get(pc.getIdentifier());
             if (pass != null) {
                 pc.setPassword(pass);
                 return;
+            } else {
+                pc.setPassword("password");
             }
         }
     }
     
-    /**
-     * Add an alias/password pair to the callback mechanism.
-     */
-    public void setAliasPassword(String alias, String password) {
-        passwords.put(alias, password);
-    }
+
 }

Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/UTPasswordCallback.java (from r1500669, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/UTPasswordCallback.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/UTPasswordCallback.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java&r1=1500669&r2=1500684&rev=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/UTPasswordCallback.java Mon Jul  8 12:13:23 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.systest.ws.wssec10.server;
+package org.apache.cxf.systest.ws.common;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -29,8 +29,8 @@ import javax.security.auth.callback.Unsu
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 /**
+ * A CallbackHandler implementation for UsernameTokens.
  */
-
 public class UTPasswordCallback implements CallbackHandler {
     
     private Map<String, String> passwords = 
@@ -41,6 +41,7 @@ public class UTPasswordCallback implemen
         passwords.put("Frank", "invalid-password");
         //for MS clients
         passwords.put("abcd", "dcba");
+        passwords.put("alice", "password");
         passwords.put("bob", "password");
     }
 
@@ -51,6 +52,7 @@ public class UTPasswordCallback implemen
     public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
         for (int i = 0; i < callbacks.length; i++) {
             WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
             String pass = passwords.get(pc.getIdentifier());
             if (pass != null) {
                 pc.setPassword(pass);

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=1500684&r1=1500683&r2=1500684&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 Mon Jul  8 12:13:23 2013
@@ -84,7 +84,7 @@ public class DefaultCryptoCoverageChecke
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;"
                      + "{}{http://docs.oasis-open.org/wss/2004/01/oasis-"
@@ -127,7 +127,7 @@ public class DefaultCryptoCoverageChecke
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
         
@@ -180,7 +180,7 @@ public class DefaultCryptoCoverageChecke
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://docs.oasis-open.org/wss/2004/01/oasis-"
                      + "200401-wss-wssecurity-utility-1.0.xsd}Timestamp;");
@@ -234,7 +234,7 @@ public class DefaultCryptoCoverageChecke
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://www.w3.org/2003/05/soap-envelope}Body;"
                      + "{}{http://docs.oasis-open.org/wss/2004/01/oasis-"
@@ -277,7 +277,7 @@ public class DefaultCryptoCoverageChecke
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://www.w3.org/2003/05/soap-envelope}Body;");
         
@@ -330,7 +330,7 @@ public class DefaultCryptoCoverageChecke
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://docs.oasis-open.org/wss/2004/01/oasis-"
                      + "200401-wss-wssecurity-utility-1.0.xsd}Timestamp;");
@@ -387,7 +387,7 @@ public class DefaultCryptoCoverageChecke
         outProps.put("user", "alice");
         outProps.put("encryptionUser", "bob");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
         outProps.put("encryptionParts",
@@ -433,7 +433,7 @@ public class DefaultCryptoCoverageChecke
         outProps.put("user", "alice");
         outProps.put("encryptionUser", "bob");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
         outProps.put("encryptionParts",
@@ -489,7 +489,7 @@ public class DefaultCryptoCoverageChecke
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;"
                      + "{}{http://docs.oasis-open.org/wss/2004/01/oasis-"

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=1500684&r1=1500683&r2=1500684&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 Mon Jul  8 12:13:23 2013
@@ -84,7 +84,7 @@ public class StaxCryptoCoverageCheckerTe
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;"
                      + "{}{http://docs.oasis-open.org/wss/2004/01/oasis-"
@@ -127,7 +127,7 @@ public class StaxCryptoCoverageCheckerTe
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
         
@@ -180,7 +180,7 @@ public class StaxCryptoCoverageCheckerTe
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://docs.oasis-open.org/wss/2004/01/oasis-"
                      + "200401-wss-wssecurity-utility-1.0.xsd}Timestamp;");
@@ -234,7 +234,7 @@ public class StaxCryptoCoverageCheckerTe
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://www.w3.org/2003/05/soap-envelope}Body;"
                      + "{}{http://docs.oasis-open.org/wss/2004/01/oasis-"
@@ -277,7 +277,7 @@ public class StaxCryptoCoverageCheckerTe
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://www.w3.org/2003/05/soap-envelope}Body;");
         
@@ -330,7 +330,7 @@ public class StaxCryptoCoverageCheckerTe
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://docs.oasis-open.org/wss/2004/01/oasis-"
                      + "200401-wss-wssecurity-utility-1.0.xsd}Timestamp;");
@@ -387,7 +387,7 @@ public class StaxCryptoCoverageCheckerTe
         outProps.put("user", "alice");
         outProps.put("encryptionUser", "bob");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
         outProps.put("encryptionParts",
@@ -433,7 +433,7 @@ public class StaxCryptoCoverageCheckerTe
         outProps.put("user", "alice");
         outProps.put("encryptionUser", "bob");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
         outProps.put("encryptionParts",
@@ -489,7 +489,7 @@ public class StaxCryptoCoverageCheckerTe
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;"
                      + "{}{http://docs.oasis-open.org/wss/2004/01/oasis-"

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=1500684&r1=1500683&r2=1500684&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 Mon Jul  8 12:13:23 2013
@@ -163,7 +163,7 @@ public class FaultTest extends AbstractB
         Client client = ((DispatchImpl<DOMSource>) dispatch).getClient();
         client.getRequestContext().put(
             "ws-security.callback-handler",
-            "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"
+            "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"
         );
         client.getRequestContext().put(
             "ws-security.encryption.properties", 

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=1500684&r1=1500683&r2=1500684&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 Mon Jul  8 12:13:23 2013
@@ -145,7 +145,7 @@ public class HTTPGetTest extends Abstrac
                      "org/apache/cxf/systest/ws/wssec10/client/alice.properties");
         outProps.put("user", "alice");
         outProps.put("passwordCallbackClass", 
-                     "org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback");
+                     "org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("signatureParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;"
                      + "{}{http://docs.oasis-open.org/wss/2004/01/oasis-"

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=1500684&r1=1500683&r2=1500684&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 Mon Jul  8 12:13:23 2013
@@ -37,11 +37,11 @@ import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.service.model.MessageInfo.Type;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
+import org.apache.cxf.systest.ws.common.UTPasswordCallback;
 import org.apache.cxf.systest.ws.policy.javafirst.BindingSimpleService;
 import org.apache.cxf.systest.ws.policy.javafirst.NoAlternativesOperationSimpleService;
 import org.apache.cxf.systest.ws.policy.javafirst.OperationSimpleService;
 import org.apache.cxf.systest.ws.policy.server.JavaFirstPolicyServer;
-import org.apache.cxf.systest.ws.wssec11.client.UTPasswordCallback;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java Mon Jul  8 12:13:23 2013
@@ -54,6 +54,7 @@ import org.apache.cxf.jaxws.EndpointImpl
 import org.apache.cxf.message.Message;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.systest.ws.common.DoubleItImpl;
+import org.apache.cxf.systest.ws.common.KeystorePasswordCallback;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.policy.PolicyEngine;

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java Mon Jul  8 12:13:23 2013
@@ -25,7 +25,7 @@ import javax.xml.ws.Endpoint;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback;
+import org.apache.cxf.systest.ws.common.KeystorePasswordCallback;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java Mon Jul  8 12:13:23 2013
@@ -45,7 +45,7 @@ public class CustomUsernameTokenIntercep
         // add roles this user is in
         String roleName = "Alice".equals(name) ? "developers" : "pms";
         String expectedPassword = "Alice".equals(name) ? "ecilA" 
-            : UsernameToken.doPasswordDigest(nonce, created, "knarF");
+            : UsernameToken.doPasswordDigest(nonce, created, "invalid-password");
         if (!password.equals(expectedPassword)) {
             throw new SecurityException("Wrong Password");
         }

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java Mon Jul  8 12:13:23 2013
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.ws.wssec1
 import javax.jws.WebService;
 import javax.xml.ws.Endpoint;
 
+import org.apache.cxf.systest.ws.common.KeystorePasswordCallback;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 

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=1500684&r1=1500683&r2=1500684&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 Mon Jul  8 12:13:23 2013
@@ -24,6 +24,7 @@ import javax.xml.ws.Endpoint;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.systest.ws.common.KeystorePasswordCallback;
 import org.apache.cxf.systest.ws.wssec11.RestrictedAlgorithmSuiteLoader;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.ws.security.SecurityConstants;

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml Mon Jul  8 12:13:23 2013
@@ -73,7 +73,7 @@
                <constructor-arg>
                    <map>
                         <entry key="action" value="UsernameToken"/> 
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                         <entry key="user" value="Alice"/>
                    </map>
                </constructor-arg>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml Mon Jul  8 12:13:23 2013
@@ -92,7 +92,7 @@
                <constructor-arg>
                    <map>
                         <entry key="action" value="UsernameToken"/> 
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                    </map>
                </constructor-arg>
            </bean>
@@ -113,7 +113,7 @@
                <constructor-arg>
                    <map>
                         <entry key="action" value="UsernameToken"/> 
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                    </map>
                </constructor-arg>
            </bean>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml Mon Jul  8 12:13:23 2013
@@ -46,7 +46,7 @@
 		<jaxws:properties>
 			<entry key="ws-security.username" value="Alice" />
 			<entry key="ws-security.callback-handler"
-				value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+				value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
 			<entry key="ws-security.encryption.properties"
 				value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
 			<entry key="ws-security.encryption.username" value="bob" />
@@ -65,7 +65,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -84,7 +84,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -103,7 +103,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -127,7 +127,7 @@
                         <entry key="user" value="Alice" />
                         <entry key="encryptionUser" value="bob" />
                         <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                               value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                         <entry key="encryptionPropFile"
                                value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
                         <entry key="encryptionKeyTransportAlgorithm"
@@ -149,7 +149,7 @@
                         <entry key="user" value="Alice" />
                         <entry key="encryptionUser" value="bob" />
                         <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                               value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                         <entry key="encryptionPropFile"
                                value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
                         <entry key="encryptionKeyTransportAlgorithm"
@@ -171,7 +171,7 @@
                         <entry key="user" value="Alice" />
                         <entry key="encryptionUser" value="bob" />
                         <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                               value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                         <entry key="encryptionPropFile"
                                value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
                         <entry key="encryptionKeyTransportAlgorithm"
@@ -194,7 +194,7 @@
                         <entry key="action" value="Signature"/> 
                         <entry key="user" value="alice" />
                         <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                               value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                         <entry key="signaturePropFile"
                                value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" />
                         <entry key="signatureAlgorithm"
@@ -215,7 +215,7 @@
                         <entry key="action" value="Signature"/> 
                         <entry key="user" value="alice" />
                         <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                               value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                         <entry key="signaturePropFile"
                                value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" />
                         <entry key="signatureAlgorithm"

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/server.xml Mon Jul  8 12:13:23 2013
@@ -53,7 +53,7 @@
 
 		<jaxws:properties>
 			<entry key="ws-security.callback-handler"
-				value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+				value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
 			<entry key="ws-security.signature.properties"
 				value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
 			<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -76,7 +76,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -99,7 +99,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -122,7 +122,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -149,7 +149,7 @@
                     <map>
                         <entry key="action" value="Encrypt"/> 
                         <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                               value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                         <entry key="decryptionPropFile"
                                value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" /> 
                         <entry key="encryptionKeyTransportAlgorithm"
@@ -176,7 +176,7 @@
                     <map>
                         <entry key="action" value="Encrypt"/> 
                         <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                               value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                         <entry key="decryptionPropFile"
                                value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" /> 
                         <entry key="encryptionKeyTransportAlgorithm"
@@ -203,7 +203,7 @@
                     <map>
                         <entry key="action" value="Encrypt"/> 
                         <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                               value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                         <entry key="decryptionPropFile"
                                value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" /> 
                         <entry key="encryptionKeyTransportAlgorithm"
@@ -230,7 +230,7 @@
                     <map>
                         <entry key="action" value="Signature"/> 
                         <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                               value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                         <entry key="signaturePropFile"
                                value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" /> 
                         <entry key="signatureAlgorithm"
@@ -255,7 +255,7 @@
                     <map>
                         <entry key="action" value="Signature"/> 
                         <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                               value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
                         <entry key="signaturePropFile"
                                value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" /> 
                         <entry key="signatureAlgorithm"

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/stax-server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/stax-server.xml Mon Jul  8 12:13:23 2013
@@ -53,7 +53,7 @@
 
 		<jaxws:properties>
 			<entry key="ws-security.callback-handler"
-				value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+				value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
 			<entry key="ws-security.signature.properties"
 				value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
 			<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -77,7 +77,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -101,7 +101,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml Mon Jul  8 12:13:23 2013
@@ -46,7 +46,7 @@
 		<jaxws:properties>
 			<entry key="ws-security.username" value="Alice" />
 			<entry key="ws-security.callback-handler"
-				value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+				value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
 			<entry key="ws-security.encryption.properties"
 				value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
 			<entry key="ws-security.encryption.username" value="bob" />
@@ -68,7 +68,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -90,7 +90,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -112,7 +112,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -134,7 +134,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -156,7 +156,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -178,7 +178,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -200,7 +200,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -222,7 +222,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -244,7 +244,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -266,7 +266,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -288,7 +288,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -310,7 +310,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -332,7 +332,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -354,7 +354,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -376,7 +376,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -398,7 +398,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -420,7 +420,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -442,7 +442,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />
@@ -464,7 +464,7 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice" />
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.encryption.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="bob" />

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml Mon Jul  8 12:13:23 2013
@@ -52,7 +52,7 @@
 
 		<jaxws:properties>
 			<entry key="ws-security.callback-handler"
-				value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+				value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
 			<entry key="ws-security.signature.properties"
 				value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
 			<entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -75,7 +75,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -98,7 +98,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -121,7 +121,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -144,7 +144,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -167,7 +167,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -190,7 +190,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -213,7 +213,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -236,7 +236,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -259,7 +259,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -282,7 +282,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -305,7 +305,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -328,7 +328,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -351,7 +351,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -374,7 +374,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -397,7 +397,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -420,7 +420,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -443,7 +443,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -466,7 +466,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />
@@ -489,7 +489,7 @@
 
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
             <entry key="ws-security.signature.properties"
                 value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
             <entry key="ws-security.encryption.username" value="useReqSigCert" />

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml Mon Jul  8 12:13:23 2013
@@ -67,7 +67,7 @@
                <entry key="action" value="Signature"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
            </constructor-arg>
         </bean>
@@ -86,7 +86,7 @@
                <entry key="action" value="Signature"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
            </constructor-arg>
         </bean>
@@ -99,7 +99,7 @@
                <entry key="action" value="Signature"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
            </constructor-arg>
         </bean>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml Mon Jul  8 12:13:23 2013
@@ -59,7 +59,7 @@
                <entry key="action" value="Signature Timestamp"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
            </constructor-arg>
         </bean>
@@ -83,7 +83,7 @@
                <entry key="action" value="Signature Timestamp"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
            </constructor-arg>
         </bean>
@@ -111,7 +111,7 @@
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="decryptionPropFile" value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
            </constructor-arg>
         </bean>
@@ -139,7 +139,7 @@
                <entry key="action" value="Signature Timestamp"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
            </constructor-arg>
         </bean>
@@ -165,7 +165,7 @@
                <entry key="action" value="Signature"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
                <entry key="user" value="alice"/>
             </map>
            </constructor-arg>
@@ -188,7 +188,7 @@
                <entry key="action" value="Signature"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
                <entry key="user" value="alice"/>
             </map>
            </constructor-arg>
@@ -201,7 +201,7 @@
                <entry key="action" value="Signature"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
                <entry key="user" value="alice"/>
             </map>
            </constructor-arg>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/stax-server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/stax-server.xml Mon Jul  8 12:13:23 2013
@@ -59,7 +59,7 @@
                <entry key="action" value="Signature Timestamp"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
            </constructor-arg>
         </bean>
@@ -83,7 +83,7 @@
                <entry key="action" value="Signature Timestamp"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
            </constructor-arg>
         </bean>
@@ -111,7 +111,7 @@
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="decryptionPropFile" value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
            </constructor-arg>
         </bean>
@@ -139,7 +139,7 @@
                <entry key="action" value="Signature Timestamp"/>
                <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                <entry key="passwordCallbackClass" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
            </constructor-arg>
         </bean>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml Mon Jul  8 12:13:23 2013
@@ -43,7 +43,7 @@
                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
            <entry key="ws-security.encryption.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
@@ -54,7 +54,7 @@
                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
            <entry key="ws-security.encryption.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server/server.xml Mon Jul  8 12:13:23 2013
@@ -54,7 +54,7 @@
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
        </jaxws:properties> 
@@ -72,7 +72,7 @@
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
        </jaxws:properties> 
@@ -90,7 +90,7 @@
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
        </jaxws:properties> 

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml Mon Jul  8 12:13:23 2013
@@ -49,7 +49,7 @@
                   value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
        </jaxws:properties>
     </jaxws:client>
     
@@ -63,7 +63,7 @@
                   value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
            <entry key="ws-security.is-bsp-compliant" value="false"/>
        </jaxws:properties>
     </jaxws:client>
@@ -78,7 +78,7 @@
                   value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
        </jaxws:properties>
     </jaxws:client>
     



Mime
View raw message