cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1501164 [4/5] - in /cxf/trunk/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/coverage_checker/ java/org/apache/cxf/systest/ws/fault/ java/org/apache/cxf/systest/ws/httpget/ java/org/apache/cxf/systest/ws/saml/client/ java/or...
Date Tue, 09 Jul 2013 09:37:15 GMT
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=1501164&r1=1501163&r2=1501164&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 Tue Jul  9 09:37:13 2013
@@ -58,10 +58,10 @@
     <http:conduit name="https://.*/UserNameOverTransport.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/alice.jks"/>
+                <sec:keyStore type="jks" password="password" resource="certs/alice.jks"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/bob.jks"/>
+                <sec:keyStore type="jks" password="password" resource="certs/bob.jks"/>
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>    
@@ -73,8 +73,8 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
             <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"/>
+            <entry key="ws-security.signature.properties" value="alice.properties"/>
+            <entry key="ws-security.encryption.properties" value="bob.properties"/>
         </jaxws:properties>
     </jaxws:client>
 
@@ -86,8 +86,8 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
             <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"/>
+            <entry key="ws-security.signature.properties" value="alice.properties"/>
+            <entry key="ws-security.encryption.properties" value="bob.properties"/>
         </jaxws:properties>
     </jaxws:client>
 

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=1501164&r1=1501163&r2=1501164&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 Tue Jul  9 09:37:13 2013
@@ -58,10 +58,10 @@
     <http:conduit name="https://.*/UserNameOverTransport.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks"/>
+                <sec:keyStore type="jks" password="password" resource="certs/restricted/alice.jks"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks"/>
+                <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/>
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>    
@@ -73,8 +73,8 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
             <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"/>
+            <entry key="ws-security.signature.properties" value="alice.properties"/>
+            <entry key="ws-security.encryption.properties" value="bob.properties"/>
         </jaxws:properties>
     </jaxws:client>
 
@@ -86,8 +86,8 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
             <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"/>
+            <entry key="ws-security.signature.properties" value="alice.properties"/>
+            <entry key="ws-security.encryption.properties" value="bob.properties"/>
         </jaxws:properties>
     </jaxws:client>
 

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=1501164&r1=1501163&r2=1501164&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 Tue Jul  9 09:37:13 2013
@@ -57,10 +57,10 @@
     <http:conduit name="https://.*/UserNameOverTransport.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks"/>
+                <sec:keyStore type="jks" password="password" resource="certs/restricted/alice.jks"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks"/>
+                <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/>
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>

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=1501164&r1=1501163&r2=1501164&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 Tue Jul  9 09:37:13 2013
@@ -54,10 +54,10 @@
         <httpj:engine port="${testutil.ports.Server.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/bob.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/bob.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/alice.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/alice.jks"/>
                 </sec:trustManagers> 
 
                 <sec:cipherSuitesFilter>
@@ -119,7 +119,7 @@
         
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
+            <entry key="ws-security.signature.properties" value="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.common.KeystorePasswordCallback"/>
@@ -141,7 +141,7 @@
         
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
+            <entry key="ws-security.signature.properties" value="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.common.KeystorePasswordCallback"/>

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=1501164&r1=1501163&r2=1501164&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 Tue Jul  9 09:37:13 2013
@@ -54,10 +54,10 @@
         <httpj:engine port="${testutil.ports.Server.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="restricted/bob.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="restricted/alice.jks"/>
                 </sec:trustManagers> 
 
                 <sec:cipherSuitesFilter>
@@ -120,7 +120,7 @@
         
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
+            <entry key="ws-security.signature.properties" value="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.common.KeystorePasswordCallback"/>
@@ -142,7 +142,7 @@
         
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
+            <entry key="ws-security.signature.properties" value="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.common.KeystorePasswordCallback"/>

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=1501164&r1=1501163&r2=1501164&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 Tue Jul  9 09:37:13 2013
@@ -47,10 +47,10 @@
         <httpj:engine port="${testutil.ports.AuthorizedServer.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/restricted/alice.jks"/>
                 </sec:trustManagers> 
 
                 <sec:cipherSuitesFilter>

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=1501164&r1=1501163&r2=1501164&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 Tue Jul  9 09:37:13 2013
@@ -47,10 +47,10 @@
         <httpj:engine port="${testutil.ports.AuthorizedServer2.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/restricted/alice.jks"/>
                 </sec:trustManagers> 
 
                 <sec:cipherSuitesFilter>

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=1501164&r1=1501163&r2=1501164&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 Tue Jul  9 09:37:13 2013
@@ -54,10 +54,10 @@
         <httpj:engine port="${testutil.ports.StaxServer.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/bob.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/bob.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/alice.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/alice.jks"/>
                 </sec:trustManagers> 
 
                 <sec:cipherSuitesFilter>
@@ -121,7 +121,7 @@
         
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
+            <entry key="ws-security.signature.properties" value="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.common.KeystorePasswordCallback"/>
@@ -144,7 +144,7 @@
         
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
+            <entry key="ws-security.signature.properties" value="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.common.KeystorePasswordCallback"/>

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=1501164&r1=1501163&r2=1501164&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 Tue Jul  9 09:37:13 2013
@@ -54,10 +54,10 @@
         <httpj:engine port="${testutil.ports.StaxServer.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="certs/restricted/alice.jks"/>
                 </sec:trustManagers> 
 
                 <sec:cipherSuitesFilter>
@@ -122,7 +122,7 @@
         
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
+            <entry key="ws-security.signature.properties" value="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.common.KeystorePasswordCallback"/>
@@ -145,7 +145,7 @@
         
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
-            <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
+            <entry key="ws-security.signature.properties" value="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.common.KeystorePasswordCallback"/>

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=1501164&r1=1501163&r2=1501164&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 Tue Jul  9 09:37:13 2013
@@ -44,31 +44,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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
 
@@ -76,35 +76,35 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="abcd"/>
             <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"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>    
     
@@ -112,56 +112,56 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
             <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"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>        
 </beans>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client_restricted.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client_restricted.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client_restricted.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client_restricted.xml Tue Jul  9 09:37:13 2013
@@ -50,31 +50,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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
 
@@ -82,35 +82,35 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="abcd"/>
             <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/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>    
     
@@ -118,56 +118,56 @@
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
             <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/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://WSSec/wssec11}X-AES192_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
             <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/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/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.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/> 
+            <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> 
         </jaxws:properties>
     </jaxws:client>        
 </beans>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml Tue Jul  9 09:37:13 2013
@@ -42,8 +42,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKeyIdentifierPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
        </jaxws:properties>
     </jaxws:client>
@@ -51,8 +50,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKeyIdentifierPort2" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
        </jaxws:properties>
     </jaxws:client>
@@ -60,8 +58,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItIssuerSerialPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
        </jaxws:properties>
     </jaxws:client>
@@ -69,8 +66,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItThumbprintPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
        </jaxws:properties>
     </jaxws:client>
@@ -78,8 +74,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItContentEncryptedElementsPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
        </jaxws:properties>
     </jaxws:client>
@@ -87,11 +82,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricIssuerSerialPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -101,11 +94,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricThumbprintPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -115,11 +106,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricEncryptBeforeSigningPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -129,11 +118,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricEncryptSignaturePort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -143,10 +130,8 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSignaturePort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -156,10 +141,8 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSignatureSP11Port" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -169,11 +152,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricEncryptionPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
        </jaxws:properties>
@@ -182,11 +163,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricProtectTokensPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -196,11 +175,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricUsernameTokenPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
@@ -211,8 +188,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricProtectTokensPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
        </jaxws:properties>
     </jaxws:client>
@@ -220,8 +196,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -231,8 +206,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingSP11Port" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -242,8 +216,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSignedEndorsingPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -253,8 +226,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingEncryptedPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -264,8 +236,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSignedEndorsingEncryptedPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -275,8 +246,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingSignedPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -294,8 +264,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportKVTPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -305,11 +274,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingTokenPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -325,11 +292,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingTokenPort2" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -345,11 +310,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportPKISupportingTokenPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -365,11 +328,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportNegativeEndorsingPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -385,11 +346,9 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportNegativeEndorsingPort2" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+           <entry key="ws-security.encryption.properties" value="bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
-           <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+           <entry key="ws-security.signature.properties" value="alice.properties"/> 
            <entry key="ws-security.signature.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml Tue Jul  9 09:37:13 2013
@@ -89,7 +89,7 @@
         factory-method="getInstance">
         <constructor-arg>
             <util:properties id="cryptoProperties" 
-                     location="classpath:org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+                     location="classpath:bob.properties"/>
         </constructor-arg>
     </bean>
     
@@ -105,8 +105,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
        </jaxws:properties> 
      
     </jaxws:endpoint> 
@@ -123,8 +122,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
        </jaxws:properties> 
      
     </jaxws:endpoint> 
@@ -141,8 +139,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
        </jaxws:properties> 
      
     </jaxws:endpoint> 
@@ -159,8 +156,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
        </jaxws:properties> 
      
     </jaxws:endpoint> 
@@ -177,10 +173,8 @@
        <jaxws:properties>
           <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/bob.properties"/> 
-          <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
+          <entry key="ws-security.encryption.properties" value="alice.properties"/> 
           <entry key="ws-security.encryption.username" value="alice"/>
        </jaxws:properties> 
      
@@ -198,8 +192,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.encryption.username" value="useReqSigCert"/>
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
@@ -218,8 +211,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.encryption.username" value="useReqSigCert"/>
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
@@ -238,8 +230,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.encryption.username" value="useReqSigCert"/>
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
@@ -258,8 +249,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
      
@@ -277,8 +267,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
      
@@ -296,10 +285,8 @@
        <jaxws:properties>
           <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/bob.properties"/> 
-          <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
+          <entry key="ws-security.encryption.properties" value="alice.properties"/> 
           <entry key="ws-security.encryption.username" value="alice"/>
        </jaxws:properties> 
      
@@ -317,8 +304,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.encryption.username" value="useReqSigCert"/>
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
@@ -337,8 +323,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.encryption.username" value="useReqSigCert"/>
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
@@ -357,8 +342,7 @@
        <jaxws:properties>
           <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/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
        </jaxws:properties> 
      
     </jaxws:endpoint> 
@@ -374,8 +358,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
      
@@ -392,8 +375,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
      
@@ -410,8 +392,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
      
@@ -428,8 +409,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/>
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
      
@@ -446,8 +426,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
      
@@ -464,8 +443,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties> 
      
@@ -482,8 +460,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/cxfca.properties"/> 
+          <entry key="ws-security.signature.properties" value="cxfca.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*CN=alice.*"/>
        </jaxws:properties> 
      
@@ -500,8 +477,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.encryption.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/> 
+          <entry key="ws-security.encryption.properties" value="alice.properties"/> 
           <entry key="ws-security.is-bsp-compliant" value="false"/>
        </jaxws:properties> 
      
@@ -518,8 +494,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties>
        <jaxws:features>
@@ -542,8 +517,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties>
        <jaxws:features>
@@ -566,8 +540,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties>
        <jaxws:features>
@@ -590,8 +563,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties>
        <jaxws:features>
@@ -614,8 +586,7 @@
        depends-on="tls-settings">
         
        <jaxws:properties>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.properties" value="bob.properties"/> 
           <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
        </jaxws:properties>
        <jaxws:features>



Mime
View raw message