Author: dkulp
Date: Wed Mar 4 22:05:03 2009
New Revision: 750187
URL: http://svn.apache.org/viewvc?rev=750187&view=rev
Log:
Now at 100% passing
Modified:
cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties
cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/wssip.properties
Modified:
cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java?rev=750187&r1=750186&r2=750187&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
(original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
Wed Mar 4 22:05:03 2009
@@ -79,12 +79,12 @@
"Scenario_5_IssuedTokenForCertificate_MutualCertificate11",
"Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11",
- //"Scenario_7_IssuedTokenOverTransport_UsernameOverTransport",
//[1]
- //"Scenario_9_IssuedTokenForCertificate_MutualCertificate11",
// [1]
-
//"Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11",
//[1]
+ "Scenario_7_IssuedTokenOverTransport_UsernameOverTransport",
+ "Scenario_9_IssuedTokenForCertificate_MutualCertificate11",
+
"Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11",
};
}
- //argv = new String[] {argv[3]};
+ //argv = new String[] {argv[0]};
new SpringBusFactory().createBus("etc/client.xml");
List<String> results = new ArrayList<String>(argv.length);
@@ -130,7 +130,3 @@
}
}
-
-/*
-[1] - RSA KeyValue / Public key thing (not supported by wss4j yet)
-*/
\ No newline at end of file
Modified:
cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties?rev=750187&r1=750186&r2=750187&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties
(original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties
Wed Mar 4 22:05:03 2009
@@ -2,3 +2,4 @@
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.provider=BC
Modified: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml?rev=750187&r1=750186&r2=750187&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
(original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml Wed Mar
4 22:05:03 2009
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- -->
-<!-- Copyright (c) 1993-2007 IONA Technologies PLC. -->
-<!-- All Rights Reserved. -->
-<!-- -->
+
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:http="http://cxf.apache.org/transports/http/configuration";
@@ -112,10 +109,18 @@
<map>
<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.sts.token.properties.decrypt"
value="etc/bob.properties"/>
+ <entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
</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"/>
+ </jaxws:properties>
+ </jaxws:client>
<!-- Scenario 9 -->
@@ -129,6 +134,8 @@
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="etc/wssip.properties"/>
<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"/>
</map>
</property>
</bean>
@@ -140,8 +147,8 @@
</jaxws:client>
- <!-- Scenario 10 -->
- <bean
name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificate_MutualCertificate11.sts-client";
+ <!-- Scenario 10 -->
+ <bean
name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11.sct-client.sts-client";
class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
<property name="wsdlLocation" value="target/wsdl2/STSAsym.wsdl"/>
<property name="serviceName"
value="{http://tempuri.org/}SecurityTokenService"/>
@@ -149,15 +156,17 @@
<property name="properties">
<map>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
value="etc/alice.properties"/>
+ <entry key="ws-security.signature.properties"
value="etc/wssip.properties"/>
<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"/>
</map>
</property>
</bean>
- <jaxws:client
name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificate_MutualCertificate11";
createdFromAPI="true">
+ <jaxws:client
name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11";
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.callback-handler.sct"
value="interop.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties.sct"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
Modified:
cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/wssip.properties
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/wssip.properties?rev=750187&r1=750186&r2=750187&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/wssip.properties
(original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/wssip.properties
Wed Mar 4 22:05:03 2009
@@ -2,7 +2,7 @@
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.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.alias=WssIP's OASIS Interop
Test CA ID
+org.apache.ws.security.crypto.merlin.keystore.alias=WssIP's OASIS Interop Test
CA ID
