Author: coheigea
Date: Fri Mar 18 17:25:27 2011
New Revision: 1082985
URL: http://svn.apache.org/viewvc?rev=1082985&view=rev
Log:
All wssec10, wssec11 and wssc interop tests are now working, bar one failing
TLS test.
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/alice.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/bob.properties
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/java/interop/client/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/alice.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/bob.properties
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/java/interop/client/UTPasswordCallback.java
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/server/Server.java
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/alice.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/bob.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/client.xml
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java?rev=1082985&r1=1082984&r2=1082985&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java
Fri Mar 18 17:25:27 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/wssc/src/main/resources/etc/alice.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/alice.properties?rev=1082985&r1=1082984&r2=1082985&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/alice.properties
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/alice.properties
Fri Mar 18 17:25:27 2011
@@ -17,4 +17,4 @@
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
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/bob.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/bob.properties?rev=1082985&r1=1082984&r2=1082985&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/bob.properties
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/bob.properties
Fri Mar 18 17:25:27 2011
@@ -19,4 +19,4 @@ 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/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=1082985&r1=1082984&r2=1082985&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
Fri Mar 18 17:25:27 2011
@@ -44,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}SecureConversation_MutualCertificate10SignEncrypt_IPingService";
createdFromAPI="true">
@@ -52,51 +52,51 @@
<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"/>
+ <entry key="ws-security.is-bsp-compliant.sct" value="false"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
-
<jaxws:client name="{http://InteropBaseAddress/interop}AC_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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -105,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -114,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -123,7 +123,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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -132,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -141,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -150,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -160,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -169,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -178,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -187,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -196,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}UXDC_IPingService";
createdFromAPI="true">
@@ -204,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}UXDC-SEES_IPingService";
createdFromAPI="true">
@@ -212,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}_UX_IPingService";
createdFromAPI="true">
@@ -220,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}_UXD_IPingService";
createdFromAPI="true">
@@ -228,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}_UXD-SEES_IPingService";
createdFromAPI="true">
@@ -236,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive.sct"
value="60"/>
</jaxws:properties>
</jaxws:client>
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/UTPasswordCallback.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/UTPasswordCallback.java?rev=1082985&r1=1082984&r2=1082985&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/UTPasswordCallback.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/UTPasswordCallback.java
Fri Mar 18 17:25:27 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/interopfest/wssec10/src/main/resources/etc/alice.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/alice.properties?rev=1082985&r1=1082984&r2=1082985&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/alice.properties
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/alice.properties
Fri Mar 18 17:25:27 2011
@@ -17,4 +17,4 @@
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
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/bob.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/bob.properties?rev=1082985&r1=1082984&r2=1082985&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/bob.properties
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/bob.properties
Fri Mar 18 17:25:27 2011
@@ -20,4 +20,4 @@ org.apache.ws.security.crypto.merlin.key
# for some reason, bouncycastle has issues with bob.pfx
org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE
org.apache.ws.security.crypto.merlin.keystore.type=PKCS12
-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/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=1082985&r1=1082984&r2=1082985&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
Fri Mar 18 17:25:27 2011
@@ -47,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
<http:conduit name="https://.*/UserNameOverTransport.*";>
@@ -70,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
@@ -84,7 +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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
</jaxws:properties>
</jaxws:client>
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java?rev=1082985&r1=1082984&r2=1082985&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java
Fri Mar 18 17:25:27 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/interopfest/wssec11/src/main/java/interop/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/server/Server.java?rev=1082985&r1=1082984&r2=1082985&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/server/Server.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/server/Server.java
Fri Mar 18 17:25:27 2011
@@ -52,6 +52,9 @@ public class Server {
Endpoint ep = Endpoint.create(obj);
ep.getProperties().put(SecurityConstants.CALLBACK_HANDLER, new
KeystorePasswordCallback());
ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES,
"etc/bob.properties");
+ if (url.contains("192")) {
+ ep.getProperties().put(SecurityConstants.IS_BSP_COMPLIANT,
"false");
+ }
ep.publish(url);
}
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/alice.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/alice.properties?rev=1082985&r1=1082984&r2=1082985&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/alice.properties
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/alice.properties
Fri Mar 18 17:25:27 2011
@@ -17,4 +17,4 @@
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
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/bob.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/bob.properties?rev=1082985&r1=1082984&r2=1082985&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/bob.properties
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/bob.properties
Fri Mar 18 17:25:27 2011
@@ -17,4 +17,4 @@
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/bob.pfx
+org.apache.ws.security.crypto.merlin.keystore.file=certs/bob.pfx
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=1082985&r1=1082984&r2=1082985&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
Fri Mar 18 17:25:27 2011
@@ -38,6 +38,7 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
+
<!-- -->
<!-- Scenario 4.1 -->
<!-- -->
@@ -45,35 +46,40 @@
<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="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</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="futureTimeToLive" value="60"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
@@ -82,7 +88,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}UX-NoTimestamp_IPingService";
createdFromAPI="true">
@@ -90,7 +97,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}UXD_IPingService";
createdFromAPI="true">
@@ -98,7 +106,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}UX-SEES_IPingService";
createdFromAPI="true">
@@ -106,7 +115,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}UXD-SEES_IPingService";
createdFromAPI="true">
@@ -114,7 +124,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
@@ -123,7 +134,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}X-NoTimestamp_IPingService";
createdFromAPI="true">
@@ -131,7 +143,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}X-AES128_IPingService";
createdFromAPI="true">
@@ -139,7 +152,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}X-AES192_IPingService";
createdFromAPI="true">
@@ -147,7 +161,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}X-TripleDES_IPingService";
createdFromAPI="true">
@@ -155,7 +170,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}XD_IPingService";
createdFromAPI="true">
@@ -163,7 +179,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}XD-ES_IPingService";
createdFromAPI="true">
@@ -171,7 +188,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}XD-SEES_IPingService";
createdFromAPI="true">
@@ -179,7 +197,8 @@
<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"/>
+ <entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:client>
</beans>
