Author: dkulp
Date: Thu Dec 4 13:53:21 2008
New Revision: 723459
URL: http://svn.apache.org/viewvc?rev=723459&view=rev
Log:
Simplify the keystore properties
Modified:
cxf/sandbox/interopfest/wssec11/src/main/resources/etc/alice.properties
cxf/sandbox/interopfest/wssec11/src/main/resources/etc/bob.properties
cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml
Modified:
cxf/sandbox/interopfest/wssec11/src/main/resources/etc/alice.properties
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/resources/etc/alice.properties?rev=723459&r1=723458&r2=723459&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/resources/etc/alice.properties
(original)
+++ cxf/sandbox/interopfest/wssec11/src/main/resources/etc/alice.properties Thu
Dec 4 13:53:21 2008
@@ -1,5 +1,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.keystore.alias=Alice
org.apache.ws.security.crypto.merlin.file=certs/alice.pfx
Modified: cxf/sandbox/interopfest/wssec11/src/main/resources/etc/bob.properties
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/resources/etc/bob.properties?rev=723459&r1=723458&r2=723459&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/resources/etc/bob.properties
(original)
+++ cxf/sandbox/interopfest/wssec11/src/main/resources/etc/bob.properties Thu
Dec 4 13:53:21 2008
@@ -1,6 +1,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.keystore.alias=1
-org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE
org.apache.ws.security.crypto.merlin.file=certs/bob.pfx
Modified: cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml?rev=723459&r1=723458&r2=723459&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml (original)
+++ cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml Thu Dec
4 13:53:21 2008
@@ -30,35 +30,30 @@
<jaxws:client name="{http://InteropBaseAddress/interop}A_IPingService";
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</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.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</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.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</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.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</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.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -67,7 +62,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -75,7 +69,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -83,7 +76,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -91,7 +83,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -99,7 +90,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -108,7 +98,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -116,7 +105,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -124,7 +112,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -132,7 +119,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -140,7 +126,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -148,7 +133,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -156,7 +140,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
@@ -164,7 +147,6 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="1"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
