cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1500684 [3/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/ut/client/client-derived.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client-derived.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client-derived.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client-derived.xml Mon Jul  8 12:13:23 2013
@@ -44,7 +44,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:client>
     
@@ -53,7 +53,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:client>
     
@@ -62,7 +62,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:client>
     
@@ -71,7 +71,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:client>
     
@@ -80,7 +80,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"/>
@@ -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"/>
            <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/ut/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml Mon Jul  8 12:13:23 2013
@@ -52,7 +52,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:client>
     
@@ -61,7 +61,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:client>
     
@@ -70,7 +70,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:client>
     
@@ -79,7 +79,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:client>
     
@@ -88,7 +88,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:client>
     
@@ -97,7 +97,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.signature.username" value="alice"/>
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
@@ -110,7 +110,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.signature.username" value="alice"/>
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
@@ -122,7 +122,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:client>
     
@@ -131,7 +131,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>
@@ -190,7 +190,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>
@@ -248,7 +248,7 @@
                   createdFromAPI="true">
        <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:client>
     

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/policy-client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/policy-client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/policy-client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/policy-client.xml Mon Jul  8 12:13:23 2013
@@ -52,7 +52,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>
@@ -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"/>
        </jaxws:properties>
        <jaxws:features>
             <p:policies>
@@ -82,7 +82,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>
@@ -97,7 +97,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>
@@ -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"/>
        </jaxws:properties>
        <jaxws:features>
             <p:policies>
@@ -127,7 +127,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>
@@ -142,7 +142,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>
@@ -157,7 +157,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>
@@ -172,7 +172,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>
@@ -187,7 +187,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>
@@ -202,7 +202,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>
@@ -217,7 +217,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>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/policy-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/policy-server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/policy-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/policy-server.xml Mon Jul  8 12:13:23 2013
@@ -81,7 +81,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>
             <p:policies>
@@ -103,7 +103,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>
             <p:policies>
@@ -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"/>
        </jaxws:properties> 
        <jaxws:features>
             <p:policies>
@@ -147,7 +147,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>
             <p:policies>
@@ -169,7 +169,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>
             <p:policies>
@@ -191,7 +191,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>
             <p:policies>
@@ -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"/>
        </jaxws:properties> 
        <jaxws:features>
             <p:policies>
@@ -235,7 +235,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>
             <p:policies>
@@ -257,7 +257,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>
             <p:policies>
@@ -279,7 +279,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>
             <p:policies>
@@ -301,7 +301,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>
             <p:policies>
@@ -323,7 +323,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>
             <p:policies>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server-derived.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server-derived.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server-derived.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server-derived.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.UTPasswordCallback"/>
+                  value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
        </jaxws:properties> 
      
     </jaxws:endpoint> 
@@ -70,7 +70,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> 
@@ -86,7 +86,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>
@@ -103,7 +103,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>
@@ -119,7 +119,7 @@
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.server.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.*"/>
@@ -138,7 +138,7 @@
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.server.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.*"/>
@@ -157,7 +157,7 @@
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.server.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/ut/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml Mon Jul  8 12:13:23 2013
@@ -81,7 +81,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> 
@@ -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"/>
        </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:endpoint>
@@ -132,7 +132,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> 
@@ -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"/>
        </jaxws:properties> 
      
     </jaxws:endpoint> 
@@ -166,7 +166,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/server/bob.properties"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -186,7 +186,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/server/bob.properties"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -206,7 +206,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> 
@@ -223,7 +223,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>
          <p:policies>
@@ -289,7 +289,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>
          <p:policies>
@@ -341,7 +341,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.ut.validator" value-ref="subjectValidator"/>
        </jaxws:properties> 
        <jaxws:inInterceptors>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/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/ut/server/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/stax-server.xml Mon Jul  8 12:13:23 2013
@@ -81,7 +81,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.enable.streaming" value="true"/>
        </jaxws:properties> 
      
@@ -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.enable.streaming" value="true"/>
        </jaxws:properties> 
      
@@ -117,7 +117,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.enable.streaming" value="true"/>
        </jaxws:properties> 
      
@@ -135,7 +135,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.enable.streaming" value="true"/>
        </jaxws:properties> 
      
@@ -153,7 +153,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.enable.streaming" value="true"/>
        </jaxws:properties> 
      
@@ -171,7 +171,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/server/bob.properties"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -192,7 +192,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/server/bob.properties"/> 
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -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.enable.streaming" value="true"/>
        </jaxws:properties> 
      
@@ -231,7 +231,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.enable.streaming" value="true"/>
        </jaxws:properties> 
        <jaxws:features>
@@ -298,7 +298,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.enable.streaming" value="true"/>
        </jaxws:properties> 
        <jaxws:features>
@@ -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.ut.validator" value-ref="subjectValidator"/>
            <entry key="ws-security.enable.streaming" value="true"/>
        </jaxws:properties> 

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml Mon Jul  8 12:13:23 2013
@@ -42,12 +42,12 @@
     <jaxws:client name="{http://WSSec/wssc}SecureConversation_UserNameOverTransport_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="Alice"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssc}SecureConversation_MutualCertificate10SignEncrypt_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/alice.properties"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/>
         </jaxws:properties>
@@ -56,37 +56,37 @@
     
     <jaxws:client name="{http://WSSec/wssc}AC_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssc}ADC_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssc}ADC-ES_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssc}_A_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssc}_AD_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssc}_AD-ES_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
@@ -94,7 +94,7 @@
     <jaxws:client name="{http://WSSec/wssc}XC_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/>
         </jaxws:properties>
     </jaxws:client>
@@ -102,7 +102,7 @@
     <jaxws:client name="{http://WSSec/wssc}XDC_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client> 
@@ -110,7 +110,7 @@
     <jaxws:client name="{http://WSSec/wssc}XDC_IPingService1" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>        
@@ -118,7 +118,7 @@
     <jaxws:client name="{http://WSSec/wssc}XDC-ES_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>  
@@ -126,7 +126,7 @@
     <jaxws:client name="{http://WSSec/wssc}XDC-SEES_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>   
@@ -134,7 +134,7 @@
     <jaxws:client name="{http://WSSec/wssc}_X_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>   
@@ -142,7 +142,7 @@
     <jaxws:client name="{http://WSSec/wssc}_X10_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/alice.properties"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
@@ -151,7 +151,7 @@
     <jaxws:client name="{http://WSSec/wssc}_XD_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client> 
@@ -159,7 +159,7 @@
     <jaxws:client name="{http://WSSec/wssc}_XD-SEES_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>       
@@ -167,7 +167,7 @@
     <jaxws:client name="{http://WSSec/wssc}_XD-ES_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>     
@@ -175,42 +175,42 @@
     <jaxws:client name="{http://WSSec/wssc}UXC_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssc}UXDC_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssc}UXDC-SEES_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssc}_UX_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssc}_UXD_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssc}_UXD-SEES_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username.sct" value="abcd"/>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties.sct" value="org/apache/cxf/systest/ws/wssc/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client.xml Mon Jul  8 12:13:23 2013
@@ -46,13 +46,13 @@
     <jaxws:client name="{http://WSSec/wssec10}UserNameOverTransport_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec10}UserName_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:client>
     <http:conduit name="https://.*/UserNameOverTransport.*">
@@ -72,7 +72,7 @@
     <jaxws:client name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
         </jaxws:properties>
@@ -85,7 +85,7 @@
     <jaxws:client name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
             <entry key="ws-security.encryption.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/wssec10/client/client_restricted.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml Mon Jul  8 12:13:23 2013
@@ -46,13 +46,13 @@
     <jaxws:client name="{http://WSSec/wssec10}UserNameOverTransport_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec10}UserName_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:client>
     <http:conduit name="https://.*/UserNameOverTransport.*">
@@ -72,7 +72,7 @@
     <jaxws:client name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
         </jaxws:properties>
@@ -85,7 +85,7 @@
     <jaxws:client name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
             <entry key="ws-security.encryption.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/wssec10/client/client_restricted_unauthorized.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml Mon Jul  8 12:13:23 2013
@@ -43,14 +43,14 @@
     <jaxws:client name="{http://WSSec/wssec10}UserName_IPingService_hashed" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Frank"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:client>
 
     <jaxws:client name="{http://WSSec/wssec10}UserNameOverTransport_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Frank"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:client>
     

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

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

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml Mon Jul  8 12:13:23 2013
@@ -132,7 +132,7 @@
         
        <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.server.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             
             <!-- new property -->
             <entry key="ws-security.validate.token" value="false"/>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml Mon Jul  8 12:13:23 2013
@@ -100,7 +100,7 @@
         
        <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.server.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <!-- new property -->
             <entry key="ws-security.validate.token" value="false"/>
         </jaxws:properties> 

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/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/wssec10/server/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server.xml Mon Jul  8 12:13:23 2013
@@ -88,7 +88,7 @@
         
        <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.server.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties> 
      
@@ -102,7 +102,7 @@
         
        <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.server.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties> 
      
@@ -124,7 +124,7 @@
             <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
             <entry key="ws-security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties> 
 
@@ -147,7 +147,7 @@
             <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
             <entry key="ws-security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties> 
 

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server_restricted.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server_restricted.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server_restricted.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server_restricted.xml Mon Jul  8 12:13:23 2013
@@ -88,7 +88,7 @@
         
        <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.server.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties> 
      
@@ -102,7 +102,7 @@
         
        <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.server.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties> 
      
@@ -125,7 +125,7 @@
             <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
             <entry key="ws-security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties> 
 
@@ -148,7 +148,7 @@
             <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
             <entry key="ws-security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties> 
 

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client.xml Mon Jul  8 12:13:23 2013
@@ -43,31 +43,31 @@
     <!-- -->
     <jaxws:client name="{http://WSSec/wssec11}A_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}A-NoTimestamp_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}AD_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}A-ES_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}AD-ES_IPingService" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
@@ -75,35 +75,35 @@
     <jaxws:client name="{http://WSSec/wssec11}UX_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="abcd"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}UX-NoTimestamp_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="abcd"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}UXD_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="abcd"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>    
     <jaxws:client name="{http://WSSec/wssec11}UX-SEES_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="abcd"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>    
     <jaxws:client name="{http://WSSec/wssec11}UXD-SEES_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="abcd"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>    
@@ -111,56 +111,56 @@
     <jaxws:client name="{http://WSSec/wssec11}X_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}X-NoTimestamp_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}X-AES128_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}X-AES256_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}X-TripleDES_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}XD_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
         <jaxws:client name="{http://WSSec/wssec11}XD-ES_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}XD-SEES_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>        



Mime
View raw message