cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1500684 [2/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
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/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"/> 
           <entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -74,7 +74,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"/> 
           <entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -95,7 +95,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"/> 
           <entry key="ws-security.encryption.username" value="useReqSigCert"/>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/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/gcm/server/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/stax-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"/> 
           <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.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"/> 
           <entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -97,7 +97,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"/> 
           <entry key="ws-security.encryption.username" value="useReqSigCert"/>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/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> 
@@ -77,7 +77,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/kerberos/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml Mon Jul  8 12:13:23 2013
@@ -117,7 +117,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"/>
@@ -148,7 +148,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>
     
@@ -156,7 +156,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"/>
@@ -209,7 +209,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"/>
@@ -230,7 +230,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/kerberos/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml Mon Jul  8 12:13:23 2013
@@ -110,7 +110,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"/> 
            <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
@@ -129,7 +129,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"/> 
            <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
@@ -148,7 +148,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"/> 
            <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
@@ -168,7 +168,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/> 
            <entry key="ws-security.encryption.properties" 
@@ -209,7 +209,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/> 
            <entry key="ws-security.encryption.properties" 
@@ -232,7 +232,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"/> 
            <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
@@ -251,7 +251,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"/> 
            <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
@@ -271,7 +271,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/> 
            <entry key="ws-security.encryption.properties" 
@@ -295,7 +295,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/> 
            <entry key="ws-security.encryption.properties" 
@@ -318,7 +318,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"/> 
            <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
@@ -337,7 +337,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"/> 
            <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/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/kerberos/server/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/stax-server.xml Mon Jul  8 12:13:23 2013
@@ -141,7 +141,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"/> 
            <entry key="ws-security.enable.streaming" value="true"/>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/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" />

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/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.encryption.username" value="useReqSigCert" />
@@ -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.encryption.username" value="useReqSigCert" />
@@ -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.encryption.username" value="useReqSigCert" />
@@ -125,7 +125,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" />
@@ -149,7 +149,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" />
@@ -173,7 +173,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" />
@@ -197,7 +197,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" />
@@ -221,7 +221,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" />
@@ -245,7 +245,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" />
@@ -269,7 +269,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="alice" />
@@ -295,7 +295,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="alice" />
@@ -321,7 +321,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="alice" />
@@ -347,7 +347,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="alice" />
@@ -373,7 +373,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="alice" />
@@ -399,7 +399,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="alice" />
@@ -425,7 +425,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="alice" />

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/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" />
@@ -67,7 +67,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" />
@@ -83,7 +83,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" />
@@ -104,7 +104,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" />
         </jaxws:properties>
         <jaxws:features>
             <p:policies>
@@ -121,7 +121,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:features>
             <p:policies>
@@ -139,7 +139,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:features>
             <p:policies>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/javafirstserver.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/javafirstserver.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/javafirstserver.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/javafirstserver.xml Mon Jul  8 12:13:23 2013
@@ -105,7 +105,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" />
 		</jaxws:properties>
 	</jaxws:endpoint>
 	
@@ -115,7 +115,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" />
 		</jaxws:properties>
 
 		<jaxws:features>
@@ -129,7 +129,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" />
 		</jaxws:properties>
 
 		<jaxws:features>
@@ -143,7 +143,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" />
 		</jaxws:properties>
 
 		<jaxws:features>
@@ -159,7 +159,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" />
 		</jaxws:properties>
 	</jaxws:endpoint>
 
@@ -170,7 +170,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" />
 		</jaxws:properties>
 	</jaxws:endpoint>
 
@@ -181,7 +181,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" />
 		</jaxws:properties>
 	</jaxws:endpoint>
 

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml Mon Jul  8 12:13:23 2013
@@ -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.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" />
@@ -120,7 +120,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" />
@@ -142,7 +142,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" />
 		</jaxws:properties>
 		
 		<jaxws:features>
@@ -193,7 +193,7 @@
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
           <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+                value="org.apache.cxf.systest.ws.common.UTPasswordCallback" />
        </jaxws:properties> 
        <jaxws:features>
             <p:policies>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml Mon Jul  8 12:13:23 2013
@@ -84,7 +84,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"/>
@@ -98,7 +98,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"/>
@@ -119,7 +119,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.signature.username" value="alice"/>
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
@@ -131,7 +131,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.signature.username" value="alice"/>
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
@@ -143,7 +143,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.signature.username" value="alice"/>
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
@@ -155,7 +155,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.signature.username" value="alice"/>
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
@@ -167,7 +167,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"/>
@@ -191,7 +191,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"/>
@@ -205,7 +205,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"/>
@@ -219,7 +219,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.signature.username" value="alice"/>
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
@@ -231,7 +231,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.signature.username" value="alice"/>
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml Mon Jul  8 12:13:23 2013
@@ -131,7 +131,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"/> 
            <entry key="ws-security.saml2.validator" 
@@ -152,7 +152,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/>
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -175,7 +175,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/>
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -204,7 +204,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -224,7 +224,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -244,7 +244,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -264,7 +264,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -284,7 +284,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/>
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -306,7 +306,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -326,7 +326,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/>
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -349,7 +349,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/>
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -370,7 +370,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -390,7 +390,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -464,7 +464,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"/> 
            <entry key="ws-security.saml2.validator" 

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/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/saml/server/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/stax-server.xml Mon Jul  8 12:13:23 2013
@@ -134,7 +134,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"/> 
            <!--<entry key="ws-security.saml2.validator" 
@@ -156,7 +156,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/>
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -180,7 +180,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/>
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -210,7 +210,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -231,7 +231,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -252,7 +252,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -273,7 +273,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -294,7 +294,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/>
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -317,7 +317,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -338,7 +338,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/>
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -362,7 +362,7 @@
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
            <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"/>
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -384,7 +384,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -405,7 +405,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"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -480,7 +480,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"/> 
            <!--<entry key="ws-security.saml2.validator" 

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/client.xml Mon Jul  8 12:13:23 2013
@@ -61,7 +61,7 @@
                 <entry key="encryptionPropFile" value="org/apache/cxf/systest/ws/security/bob.properties"/>
                 <entry key="encryptionUser" value="Bob"/>
                 <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.security.KeystorePasswordCallback"/>
+                <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
                 <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
                 <!--    
                      Recommendation: signatures should be encrypted    
@@ -85,7 +85,7 @@
                 <entry key="action" value="Timestamp Signature Encrypt"/>
                 <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/security/bob.properties"/>
                 <entry key="decryptionPropFile" value="org/apache/cxf/systest/ws/security/alice.properties"/>
-                <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.security.KeystorePasswordCallback"/>
+                <entry key="passwordCallbackClass" 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/security/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml Mon Jul  8 12:13:23 2013
@@ -75,7 +75,7 @@
             <map>
                 <entry key="action" value="UsernameToken"/> 
                 <entry key="passwordType" value="PasswordDigest"/>
-                <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.security.KeystorePasswordCallback"/> 
+                <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> 
             </map>
         </constructor-arg>
     </bean>
@@ -119,7 +119,7 @@
                 -->
                 <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/security/alice.properties"/>
                 <entry key="decryptionPropFile" value="org/apache/cxf/systest/ws/security/bob.properties"/>
-                <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.security.KeystorePasswordCallback"/>
+                <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             </map>
         </constructor-arg>
     </bean>
@@ -139,7 +139,7 @@
                 <entry key="encryptionPropFile" value="org/apache/cxf/systest/ws/security/alice.properties"/>
                 <entry key="encryptionUser" value="Alice"/>
                 <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.security.KeystorePasswordCallback"/>
+                <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
                 <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
                 <!--    
                      Recommendation: signatures should be encrypted    

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/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" />
@@ -69,7 +69,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" />
@@ -92,7 +92,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" />
@@ -115,7 +115,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" />
@@ -138,7 +138,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" />
@@ -161,7 +161,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" />
@@ -184,7 +184,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" />
@@ -207,7 +207,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" />
@@ -230,7 +230,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/tokens/client/endorsing-client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/endorsing-client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/endorsing-client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/endorsing-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" />

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/endorsing-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/endorsing-server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/endorsing-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/endorsing-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.encryption.username" value="useReqSigCert" />
@@ -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.encryption.username" value="useReqSigCert" />
@@ -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.encryption.username" value="useReqSigCert" />
@@ -125,7 +125,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" />
@@ -149,7 +149,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" />
@@ -173,7 +173,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/tokens/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/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.encryption.username" value="useReqSigCert" />
@@ -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.encryption.username" value="useReqSigCert" />
@@ -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.encryption.username" value="useReqSigCert" />
@@ -125,7 +125,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" />
@@ -149,7 +149,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" />
@@ -173,7 +173,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" />
@@ -197,7 +197,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" />
@@ -221,7 +221,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" />
@@ -245,7 +245,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" />



Mime
View raw message