Author: coheigea
Date: Tue Mar 22 16:18:29 2011
New Revision: 1084236
URL: http://svn.apache.org/viewvc?rev=1084236&view=rev
Log:
Fixed some of the WSTrust 1.0 interop tests.
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/alice.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/bob.properties
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/interopfest/wstrust10/src/main/resources/etc/wssip.properties
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java?rev=1084236&r1=1084235&r2=1084236&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java
Tue Mar 22 16:18:29 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/interopfest/wstrust10/src/main/resources/etc/alice.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/alice.properties?rev=1084236&r1=1084235&r2=1084236&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/alice.properties
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/alice.properties
Tue Mar 22 16:18:29 2011
@@ -17,5 +17,5 @@
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=PKCS12
org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.file=certs/alice.pfx
+org.apache.ws.security.crypto.merlin.keystore.file=certs/alice.pfx
org.apache.ws.security.crypto.merlin.keystore.provider=BC
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/bob.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/bob.properties?rev=1084236&r1=1084235&r2=1084236&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/bob.properties
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/bob.properties
Tue Mar 22 16:18:29 2011
@@ -19,5 +19,5 @@ org.apache.ws.security.crypto.merlin.key
org.apache.ws.security.crypto.merlin.keystore.password=password
# for some reason, bouncycastle has issues with bob.pfx
org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE
-org.apache.ws.security.crypto.merlin.file=certs/bob.pfx
+org.apache.ws.security.crypto.merlin.keystore.file=certs/bob.pfx
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=1084236&r1=1084235&r2=1084236&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 22 16:18:29 2011
@@ -51,7 +51,7 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive"
value="60"/>
</map>
</property>
</bean>
@@ -68,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive"
value="60"/>
</map>
</property>
</bean>
@@ -85,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive"
value="60"/>
</map>
</property>
</bean>
@@ -93,8 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
@@ -110,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive"
value="60"/>
</map>
</property>
</bean>
@@ -118,8 +118,7 @@
<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"/>
+ <entry key="ws-security.is-bsp-compliant.sct" value="false"/>
</jaxws:properties>
</jaxws:client>
@@ -137,15 +136,15 @@
<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"/>
+ <entry key="ws-security.timestamp.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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant.sct" value="false"/>
</jaxws:properties>
</jaxws:client>
@@ -173,6 +172,7 @@
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
<entry key="futureTimeToLive" value="60"/>
<entry key="isBspCompliant" value="false"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/wssip.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/wssip.properties?rev=1084236&r1=1084235&r2=1084236&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/wssip.properties
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/wssip.properties
Tue Mar 22 16:18:29 2011
@@ -18,7 +18,7 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=PKCS12
org.apache.ws.security.crypto.merlin.keystore.password=password
# for some reason, bouncycastle has issues with WssIP.pfx
-#org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE
-org.apache.ws.security.crypto.merlin.keystore.provider=BC
-org.apache.ws.security.crypto.merlin.file=certs/WssIP.pfx
+org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE
+#org.apache.ws.security.crypto.merlin.keystore.provider=BC
+org.apache.ws.security.crypto.merlin.keystore.file=certs/WssIP.pfx
org.apache.ws.security.crypto.merlin.keystore.alias=WssIP's OASIS Interop Test
CA ID
