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/08 14:13:24 UTC
svn commit: r1500684 [4/4] - in /cxf/trunk/systests/ws-security/src/test:
java/org/apache/cxf/systest/ws/common/
java/org/apache/cxf/systest/ws/coverage_checker/
java/org/apache/cxf/systest/ws/fault/
java/org/apache/cxf/systest/ws/httpget/ java/org/apa...
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=1500684&r1=1500683&r2=1500684&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 Mon Jul 8 12:13:23 2013
@@ -49,31 +49,31 @@
<!-- -->
<jaxws:client name="{http://WSSec/wssec11}A_IPingService" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -81,35 +81,35 @@
<jaxws:client name="{http://WSSec/wssec11}UX_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.username" value="abcd"/>
- <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -117,56 +117,56 @@
<jaxws:client name="{http://WSSec/wssec11}X_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
- <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/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.wssec11.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties"/>
</jaxws:properties>
</jaxws:client>
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=1500684&r1=1500683&r2=1500684&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 Mon Jul 8 12:13:23 2013
@@ -94,7 +94,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -108,7 +108,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -122,7 +122,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -136,7 +136,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -149,7 +149,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -162,7 +162,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -175,7 +175,7 @@
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -189,7 +189,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -204,7 +204,7 @@
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -224,7 +224,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -235,7 +235,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -246,7 +246,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -257,7 +257,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -268,7 +268,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -279,7 +279,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -287,7 +287,7 @@
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -298,7 +298,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
</jaxws:client>
@@ -312,7 +312,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
<jaxws:features>
<p:policies>
@@ -332,7 +332,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
<jaxws:features>
<p:policies>
@@ -352,7 +352,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
<jaxws:features>
<p:policies>
@@ -372,7 +372,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
<jaxws:features>
<p:policies>
@@ -392,7 +392,7 @@
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
<entry key="ws-security.signature.username" value="alice"/>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</jaxws:properties>
<jaxws:features>
<p:policies>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml Mon Jul 8 12:13:23 2013
@@ -79,7 +79,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.crypto" value-ref="crypto"/>
</jaxws:properties>
@@ -104,7 +104,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
@@ -122,7 +122,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
@@ -140,7 +140,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
@@ -158,7 +158,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
@@ -176,7 +176,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.properties"
@@ -197,7 +197,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -217,7 +217,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -237,7 +237,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -257,7 +257,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -276,7 +276,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -295,7 +295,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.properties"
@@ -316,7 +316,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -336,7 +336,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -356,7 +356,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/stax-server.xml?rev=1500684&r1=1500683&r2=1500684&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/stax-server.xml Mon Jul 8 12:13:23 2013
@@ -79,7 +79,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.crypto" value-ref="crypto"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -105,7 +105,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -124,7 +124,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -143,7 +143,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -162,7 +162,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -181,7 +181,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.properties"
@@ -203,7 +203,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -224,7 +224,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -245,7 +245,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -266,7 +266,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -286,7 +286,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -306,7 +306,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.properties"
@@ -328,7 +328,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -349,7 +349,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
@@ -370,7 +370,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>