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 2011/03/15 16:13:40 UTC
svn commit: r1081811 - in /cxf/trunk:
distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/
distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/
distribution/src/main/release...
Author: coheigea
Date: Tue Mar 15 15:13:39 2011
New Revision: 1081811
URL: http://svn.apache.org/viewvc?rev=1081811&view=rev
Log:
Some updates to systests and demos.
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/client.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/client.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/client.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Encrypt.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Sign.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_Decrypt.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_SignVerf.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/README.txt
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Encrypt.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Sign.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_Decrypt.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_SignVerf.properties
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/client.xml?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/client.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/client.xml Tue Mar 15 15:13:39 2011
@@ -44,6 +44,7 @@
<jaxws:properties>
<entry key="ws-security.username.sct" value="Alice"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.UTPasswordCallback"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}SecureConversation_MutualCertificate10SignEncrypt_IPingService" createdFromAPI="true">
@@ -51,6 +52,7 @@
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties.sct" value="etc/alice.properties"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -59,36 +61,42 @@
<jaxws:properties>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}ADC_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}ADC-ES_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}_A_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}_AD_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}_AD-ES_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -97,6 +105,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -105,6 +114,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -112,7 +122,8 @@
<jaxws:properties>
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -121,6 +132,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -129,6 +141,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -137,6 +150,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -146,6 +160,7 @@
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties.sct" value="etc/alice.properties"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -154,6 +169,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -162,6 +178,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -170,6 +187,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -178,6 +196,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}UXDC_IPingService" createdFromAPI="true">
@@ -185,6 +204,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}UXDC-SEES_IPingService" createdFromAPI="true">
@@ -192,6 +212,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}_UX_IPingService" createdFromAPI="true">
@@ -199,6 +220,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}_UXD_IPingService" createdFromAPI="true">
@@ -206,6 +228,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}_UXD-SEES_IPingService" createdFromAPI="true">
@@ -213,6 +236,7 @@
<entry key="ws-security.username.sct" value="abcd"/>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/client.xml?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/client.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/client.xml Tue Mar 15 15:13:39 2011
@@ -47,6 +47,7 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler" value="interop.client.UTPasswordCallback"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<http:conduit name="https://.*/UserNameOverTransport.*">
@@ -69,6 +70,7 @@
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties" value="etc/alice.properties"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -82,6 +84,7 @@
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties" value="etc/alice.properties"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/client.xml?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/client.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/client.xml Tue Mar 15 15:13:39 2011
@@ -45,30 +45,35 @@
<jaxws:properties>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}A-NoTimestamp_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}AD_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}A-ES_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}AD-ES_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -77,6 +82,7 @@
<entry key="ws-security.username" value="abcd"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}UX-NoTimestamp_IPingService" createdFromAPI="true">
@@ -84,6 +90,7 @@
<entry key="ws-security.username" value="abcd"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}UXD_IPingService" createdFromAPI="true">
@@ -91,13 +98,15 @@
<entry key="ws-security.username" value="abcd"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}UX-SEES_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.username" value="abcd"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}UXD-SEES_IPingService" createdFromAPI="true">
@@ -105,6 +114,7 @@
<entry key="ws-security.username" value="abcd"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -113,6 +123,7 @@
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}X-NoTimestamp_IPingService" createdFromAPI="true">
@@ -120,6 +131,7 @@
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}X-AES128_IPingService" createdFromAPI="true">
@@ -127,6 +139,7 @@
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}X-AES192_IPingService" createdFromAPI="true">
@@ -134,6 +147,7 @@
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}X-TripleDES_IPingService" createdFromAPI="true">
@@ -141,6 +155,7 @@
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}XD_IPingService" createdFromAPI="true">
@@ -148,6 +163,7 @@
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}XD-ES_IPingService" createdFromAPI="true">
@@ -155,6 +171,7 @@
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}XD-SEES_IPingService" createdFromAPI="true">
@@ -162,6 +179,7 @@
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
</beans>
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml Tue Mar 15 15:13:39 2011
@@ -47,10 +47,11 @@
<property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService"/>
<property name="properties">
<map>
- <entry key="ws-security.username" value="Alice"/>
- <entry key="ws-security.password" value="abcd!1234"/>
+ <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.password" value="abcd!1234"/>
<entry key="ws-security.sts.token.properties" value="etc/bob.properties"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+ <entry key="futureTimeToLive" value="60"/>
</map>
</property>
</bean>
@@ -67,6 +68,7 @@
<entry key="ws-security.signature.properties" value="etc/alice.properties"/>
<entry key="ws-security.encryption.properties" value="etc/wssip.properties"/>
<entry key="ws-security.sts.token.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</map>
</property>
</bean>
@@ -83,6 +85,7 @@
<entry key="ws-security.signature.properties" value="etc/alice.properties"/>
<entry key="ws-security.encryption.properties" value="etc/wssip.properties"/>
<entry key="ws-security.sts.token.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</map>
</property>
</bean>
@@ -90,6 +93,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
+ <entry key="isBspCompliant" value="false"/>
</jaxws:properties>
</jaxws:client>
@@ -105,6 +110,7 @@
<entry key="ws-security.signature.properties" value="etc/alice.properties"/>
<entry key="ws-security.encryption.properties" value="etc/wssip.properties"/>
<entry key="ws-security.sts.token.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</map>
</property>
</bean>
@@ -112,6 +118,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
+ <entry key="isBspCompliant" value="false"/>
</jaxws:properties>
</jaxws:client>
@@ -124,17 +132,20 @@
<property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService2"/>
<property name="properties">
<map>
- <entry key="ws-security.username" value="Alice"/>
- <entry key="ws-security.password" value="abcd!1234"/>
+ <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.password" value="abcd!1234"/>
<entry key="ws-security.signature.properties" value="etc/wssip.properties"/>
<entry key="ws-security.sts.token.properties" value="etc/wssip.properties"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+ <entry key="futureTimeToLive" value="60"/>
</map>
</property>
</bean>
<jaxws:client name="{http://tempuri.org/}Scenario_7_IssuedTokenOverTransport_UsernameOverTransport" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+ <entry key="futureTimeToLive" value="60"/>
+ <entry key="isBspCompliant" value="false"/>
</jaxws:properties>
</jaxws:client>
@@ -152,6 +163,7 @@
<entry key="ws-security.encryption.properties" value="etc/wssip.properties"/>
<entry key="ws-security.sts.token.properties" value="etc/wssip.properties"/>
<entry key="ws-security.sts.token.properties.decrypt" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</map>
</property>
</bean>
@@ -159,6 +171,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
+ <entry key="isBspCompliant" value="false"/>
</jaxws:properties>
</jaxws:client>
@@ -176,6 +190,7 @@
<entry key="ws-security.encryption.properties" value="etc/wssip.properties"/>
<entry key="ws-security.sts.token.properties" value="etc/wssip.properties"/>
<entry key="ws-security.sts.token.properties.decrypt" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
</map>
</property>
</bean>
@@ -183,6 +198,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
+ <entry key="futureTimeToLive" value="60"/>
+ <entry key="isBspCompliant" value="false"/>
</jaxws:properties>
</jaxws:client>
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java Tue Mar 15 15:13:39 2011
@@ -57,11 +57,6 @@ public class UTPasswordCallback implemen
return;
}
}
-
- //
- // Password not found
- //
- throw new IOException();
}
/**
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java Tue Mar 15 15:13:39 2011
@@ -57,11 +57,6 @@ public class UTPasswordCallback implemen
return;
}
}
-
- //
- // Password not found
- //
- throw new IOException();
}
/**
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Encrypt.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Encrypt.properties?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Encrypt.properties (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Encrypt.properties Tue Mar 15 15:13:39 2011
@@ -2,4 +2,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/client-truststore.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.keystore.file=keystore/client-truststore.jks
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Sign.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Sign.properties?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Sign.properties (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Sign.properties Tue Mar 15 15:13:39 2011
@@ -2,5 +2,5 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/client-keystore.jks
+org.apache.ws.security.crypto.merlin.keystore.file=keystore/client-keystore.jks
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_Decrypt.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_Decrypt.properties?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_Decrypt.properties (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_Decrypt.properties Tue Mar 15 15:13:39 2011
@@ -2,4 +2,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/server-keystore.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.keystore.file=keystore/server-keystore.jks
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_SignVerf.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_SignVerf.properties?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_SignVerf.properties (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_SignVerf.properties Tue Mar 15 15:13:39 2011
@@ -2,4 +2,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/server-truststore.jks
+org.apache.ws.security.crypto.merlin.keystore.file=keystore/server-truststore.jks
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/UTPasswordCallback.java?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/UTPasswordCallback.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/UTPasswordCallback.java Tue Mar 15 15:13:39 2011
@@ -55,11 +55,6 @@ public class UTPasswordCallback implemen
return;
}
}
-
- //
- // Password not found
- //
- throw new IOException();
}
/**
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/UTPasswordCallback.java?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/UTPasswordCallback.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/UTPasswordCallback.java Tue Mar 15 15:13:39 2011
@@ -55,11 +55,6 @@ public class UTPasswordCallback implemen
return;
}
}
-
- //
- // Password not found
- //
- throw new IOException();
}
/**
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/UTPasswordCallback.java?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/UTPasswordCallback.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/UTPasswordCallback.java Tue Mar 15 15:13:39 2011
@@ -1,71 +1,66 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package demo.wssec.client;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.ws.security.WSPasswordCallback;
-
-/**
- */
-
-public class UTPasswordCallback implements CallbackHandler {
-
- private Map<String, String> passwords =
- new HashMap<String, String>();
-
- public UTPasswordCallback() {
- passwords.put("Alice", "ecilA");
- passwords.put("abcd", "dcba");
- }
-
- /**
- * Here, we attempt to get the password from the private
- * alias/passwords map.
- */
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
-
- String pass = passwords.get(pc.getIdentifier());
- if (pass != null) {
- pc.setPassword(pass);
- return;
- }
- }
-
- //
- // Password not found
- //
- throw new IOException();
- }
-
- /**
- * Add an alias/password pair to the callback mechanism.
- */
- public void setAliasPassword(String alias, String password) {
- passwords.put(alias, password);
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package demo.wssec.client;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ */
+
+public class UTPasswordCallback implements CallbackHandler {
+
+ private Map<String, String> passwords =
+ new HashMap<String, String>();
+
+ public UTPasswordCallback() {
+ passwords.put("Alice", "ecilA");
+ passwords.put("abcd", "dcba");
+ }
+
+ /**
+ * Here, we attempt to get the password from the private
+ * alias/passwords map.
+ */
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (int i = 0; i < callbacks.length; i++) {
+ WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
+ String pass = passwords.get(pc.getIdentifier());
+ if (pass != null) {
+ pc.setPassword(pass);
+ return;
+ }
+ }
+ }
+
+ /**
+ * Add an alias/password pair to the callback mechanism.
+ */
+ public void setAliasPassword(String alias, String password) {
+ passwords.put(alias, password);
+ }
+}
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/UTPasswordCallback.java?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/UTPasswordCallback.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/UTPasswordCallback.java Tue Mar 15 15:13:39 2011
@@ -1,71 +1,66 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package demo.wssec.server;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.ws.security.WSPasswordCallback;
-
-/**
- */
-
-public class UTPasswordCallback implements CallbackHandler {
-
- private Map<String, String> passwords =
- new HashMap<String, String>();
-
- public UTPasswordCallback() {
- passwords.put("Alice", "ecilA");
- passwords.put("abcd", "dcba");
- }
-
- /**
- * Here, we attempt to get the password from the private
- * alias/passwords map.
- */
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
-
- String pass = passwords.get(pc.getIdentifier());
- if (pass != null) {
- pc.setPassword(pass);
- return;
- }
- }
-
- //
- // Password not found
- //
- throw new IOException();
- }
-
- /**
- * Add an alias/password pair to the callback mechanism.
- */
- public void setAliasPassword(String alias, String password) {
- passwords.put(alias, password);
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package demo.wssec.server;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ */
+
+public class UTPasswordCallback implements CallbackHandler {
+
+ private Map<String, String> passwords =
+ new HashMap<String, String>();
+
+ public UTPasswordCallback() {
+ passwords.put("Alice", "ecilA");
+ passwords.put("abcd", "dcba");
+ }
+
+ /**
+ * Here, we attempt to get the password from the private
+ * alias/passwords map.
+ */
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (int i = 0; i < callbacks.length; i++) {
+ WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
+ String pass = passwords.get(pc.getIdentifier());
+ if (pass != null) {
+ pc.setPassword(pass);
+ return;
+ }
+ }
+ }
+
+ /**
+ * Add an alias/password pair to the callback mechanism.
+ */
+ public void setAliasPassword(String alias, String password) {
+ passwords.put(alias, password);
+ }
+}
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/README.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/README.txt?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/README.txt (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/README.txt Tue Mar 15 15:13:39 2011
@@ -67,7 +67,7 @@ Using either UNIX or Windows:
mvn install (builds the demo)
mvn -Pserver (from one command line window)
- Mvn -Pclient (from a second command line window)
+ mvn -Pclient (from a second command line window)
On startup, the client makes a sequence of 4 two-way invocations.
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java Tue Mar 15 15:13:39 2011
@@ -57,11 +57,6 @@ public class UTPasswordCallback implemen
return;
}
}
-
- //
- // Password not found
- //
- throw new IOException();
}
/**
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java Tue Mar 15 15:13:39 2011
@@ -57,11 +57,6 @@ public class UTPasswordCallback implemen
return;
}
}
-
- //
- // Password not found
- //
- throw new IOException();
}
/**
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Encrypt.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Encrypt.properties?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Encrypt.properties (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Encrypt.properties Tue Mar 15 15:13:39 2011
@@ -2,4 +2,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/client-truststore.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.keystore.file=keystore/client-truststore.jks
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Sign.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Sign.properties?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Sign.properties (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Sign.properties Tue Mar 15 15:13:39 2011
@@ -2,5 +2,5 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/client-keystore.jks
+org.apache.ws.security.crypto.merlin.keystore.file=keystore/client-keystore.jks
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_Decrypt.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_Decrypt.properties?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_Decrypt.properties (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_Decrypt.properties Tue Mar 15 15:13:39 2011
@@ -2,4 +2,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/server-keystore.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.keystore.file=keystore/server-keystore.jks
Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_SignVerf.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_SignVerf.properties?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_SignVerf.properties (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_SignVerf.properties Tue Mar 15 15:13:39 2011
@@ -2,4 +2,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/server-truststore.jks
+org.apache.ws.security.crypto.merlin.keystore.file=keystore/server-truststore.jks
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java Tue Mar 15 15:13:39 2011
@@ -55,11 +55,6 @@ public class UTPasswordCallback implemen
return;
}
}
-
- //
- // Password not found
- //
- throw new IOException();
}
/**
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java Tue Mar 15 15:13:39 2011
@@ -56,11 +56,6 @@ public class UTPasswordCallback implemen
return;
}
}
-
- //
- // Password not found
- //
- throw new IOException();
}
/**
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java?rev=1081811&r1=1081810&r2=1081811&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java Tue Mar 15 15:13:39 2011
@@ -57,11 +57,6 @@ public class UTPasswordCallback implemen
return;
}
}
-
- //
- // Password not found
- //
- throw new IOException();
}
/**