You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/07/09 11:37:15 UTC
svn commit: r1501164 [2/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...
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml Tue Jul 9 09:37:13 2013
@@ -53,8 +53,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -76,8 +75,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -99,8 +97,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -122,8 +119,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -145,8 +141,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -168,8 +163,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -191,8 +185,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -214,8 +207,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -237,8 +229,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -260,8 +251,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -283,8 +273,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -306,8 +295,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -329,8 +317,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -352,8 +339,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -375,8 +361,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -398,8 +383,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -421,8 +405,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -444,8 +427,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -467,8 +449,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -490,8 +471,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml Tue Jul 9 09:37:13 2013
@@ -65,7 +65,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
@@ -84,7 +84,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
@@ -97,7 +97,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml Tue Jul 9 09:37:13 2013
@@ -57,7 +57,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature Timestamp"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
@@ -81,7 +81,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature Timestamp"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
@@ -108,8 +108,8 @@
<constructor-arg>
<map>
<entry key="action" value="Encrypt Signature Timestamp"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
- <entry key="decryptionPropFile" value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
+ <entry key="decryptionPropFile" value="bob.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
@@ -137,7 +137,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature Timestamp"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
@@ -163,7 +163,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="user" value="alice"/>
@@ -186,7 +186,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="user" value="alice"/>
@@ -199,7 +199,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="user" value="alice"/>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml Tue Jul 9 09:37:13 2013
@@ -57,7 +57,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature Timestamp"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
@@ -81,7 +81,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature Timestamp"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
@@ -108,8 +108,8 @@
<constructor-arg>
<map>
<entry key="action" value="Encrypt Signature Timestamp"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
- <entry key="decryptionPropFile" value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
+ <entry key="decryptionPropFile" value="bob.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
@@ -137,7 +137,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature Timestamp"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml Tue Jul 9 09:37:13 2013
@@ -44,8 +44,7 @@
<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/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>
@@ -55,8 +54,7 @@
<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/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>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml Tue Jul 9 09:37:13 2013
@@ -55,8 +55,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>
@@ -73,8 +72,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>
@@ -91,8 +89,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>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml Tue Jul 9 09:37:13 2013
@@ -43,10 +43,9 @@
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.encryption.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.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"/>
@@ -57,10 +56,9 @@
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.encryption.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.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"/>
@@ -72,10 +70,9 @@
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.encryption.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.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/gcm/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml Tue Jul 9 09:37:13 2013
@@ -55,8 +55,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>
@@ -75,8 +74,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.*"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
@@ -96,8 +94,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>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml Tue Jul 9 09:37:13 2013
@@ -55,8 +55,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.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -76,8 +75,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.*"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
@@ -98,8 +96,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.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client/client.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/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>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml Tue Jul 9 09:37:13 2013
@@ -55,8 +55,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>
@@ -75,7 +74,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature Timestamp"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml Tue Jul 9 09:37:13 2013
@@ -68,8 +68,7 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricPort"
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.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -84,8 +83,7 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricSupportingPort"
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.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -100,8 +98,7 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSupportingPort"
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.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -118,11 +115,9 @@
<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/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.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -144,8 +139,7 @@
<property name="serviceName" value="bob@service.ws.apache.org"/>
</bean>
</entry>
- <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"/>
@@ -157,11 +151,9 @@
<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/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.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -176,8 +168,7 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricProtectionPort"
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.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -192,8 +183,7 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricDerivedProtectionPort"
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.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -210,11 +200,9 @@
<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/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.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -231,11 +219,9 @@
<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/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.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -250,8 +236,7 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricEndorsingEncryptedPort"
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.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -266,8 +251,7 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricSignedEndorsingEncryptedPort"
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.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml Tue Jul 9 09:37:13 2013
@@ -111,8 +111,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.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
@@ -130,8 +129,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.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
@@ -149,8 +147,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.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
@@ -169,10 +166,8 @@
<entry key="ws-security.username" value="bob"/>
<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"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
@@ -210,10 +205,8 @@
<entry key="ws-security.username" value="bob"/>
<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"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
@@ -233,8 +226,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.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
@@ -252,8 +244,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.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
@@ -272,10 +263,8 @@
<entry key="ws-security.username" value="bob"/>
<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"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
@@ -296,10 +285,8 @@
<entry key="ws-security.username" value="bob"/>
<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"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
@@ -319,8 +306,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.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
@@ -338,8 +324,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.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml Tue Jul 9 09:37:13 2013
@@ -104,8 +104,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.kerberos.KerberosPasswordCallback"/>
- <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.enable.streaming" value="true"/>
</jaxws:properties>
@@ -123,8 +122,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.kerberos.KerberosPasswordCallback"/>
- <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.enable.streaming" value="true"/>
</jaxws:properties>
@@ -142,8 +140,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.enable.streaming" value="true"/>
</jaxws:properties>
@@ -162,10 +159,8 @@
<entry key="ws-security.username" value="bob"/>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.kerberos.KerberosPasswordCallback"/>
- <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"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -187,8 +182,7 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.kerberos.KerberosPasswordCallback"/>
- <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.enable.streaming" value="true"/>
</jaxws:properties>
@@ -207,10 +201,8 @@
<entry key="ws-security.username" value="bob"/>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.kerberos.KerberosPasswordCallback"/>
- <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"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -230,8 +222,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.kerberos.KerberosPasswordCallback"/>
- <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.enable.streaming" value="true"/>
</jaxws:properties>
@@ -249,8 +240,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.kerberos.KerberosPasswordCallback"/>
- <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.enable.streaming" value="true"/>
</jaxws:properties>
@@ -269,10 +259,8 @@
<entry key="ws-security.username" value="bob"/>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.kerberos.KerberosPasswordCallback"/>
- <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"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -293,10 +281,8 @@
<entry key="ws-security.username" value="bob"/>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.kerberos.KerberosPasswordCallback"/>
- <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"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -316,8 +302,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.kerberos.KerberosPasswordCallback"/>
- <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.enable.streaming" value="true"/>
</jaxws:properties>
@@ -335,8 +320,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.kerberos.KerberosPasswordCallback"/>
- <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.enable.streaming" value="true"/>
</jaxws:properties>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml Tue Jul 9 09:37:13 2013
@@ -47,11 +47,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -69,11 +67,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -91,11 +87,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -113,11 +107,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -135,11 +127,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -157,11 +147,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -179,11 +167,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -201,11 +187,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -223,11 +207,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -245,11 +227,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -267,11 +247,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -289,11 +267,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -311,11 +287,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -333,11 +307,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -355,11 +327,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
@@ -377,11 +347,9 @@
<entry key="ws-security.username" value="Alice" />
<entry key="ws-security.callback-handler"
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.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" />
</jaxws:properties>
<jaxws:features>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml Tue Jul 9 09:37:13 2013
@@ -54,8 +54,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -78,8 +77,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -102,8 +100,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -126,8 +123,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -150,8 +146,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -174,8 +169,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -198,8 +192,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -222,8 +215,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -246,8 +238,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.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>
@@ -270,11 +261,9 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.signature.properties" value="bob.properties" />
<entry key="ws-security.encryption.username" value="alice" />
- <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.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
<jaxws:features>
@@ -296,11 +285,9 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.signature.properties" value="bob.properties" />
<entry key="ws-security.encryption.username" value="alice" />
- <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.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
<jaxws:features>
@@ -322,11 +309,9 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.signature.properties" value="bob.properties" />
<entry key="ws-security.encryption.username" value="alice" />
- <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.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
<jaxws:features>
@@ -348,11 +333,9 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.signature.properties" value="bob.properties" />
<entry key="ws-security.encryption.username" value="alice" />
- <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.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
<jaxws:features>
@@ -374,11 +357,9 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.signature.properties" value="bob.properties" />
<entry key="ws-security.encryption.username" value="alice" />
- <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.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
<jaxws:features>
@@ -400,11 +381,9 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.signature.properties" value="bob.properties" />
<entry key="ws-security.encryption.username" value="alice" />
- <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.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
<jaxws:features>
@@ -426,11 +405,9 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
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.signature.properties" value="bob.properties" />
<entry key="ws-security.encryption.username" value="alice" />
- <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.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
<jaxws:features>