Author: dkulp
Date: Thu Dec 11 11:40:51 2008
New Revision: 725792
URL: http://svn.apache.org/viewvc?rev=725792&view=rev
Log:
Move some configuration into the config file
Modified:
cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
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=725792&r1=725791&r2=725792&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
Thu Dec 11 11:40:51 2008
@@ -84,10 +84,7 @@
STSClient stsClient = new STSClient(b);
stsClient.setPolicy(pb.getPolicy(Client.class.getResourceAsStream(argv[1])));
stsClient.setLocation("https://131.107.72.15/Security_Federation_SecurityTokenService_Indigo/Symmetric.svc/Scenario_1_IssuedTokenOverTransport_UsernameOverTransport";);
- stsClient.setSoap12();
- stsClient.getRequestContext().put(SecurityConstants.USERNAME, "Alice");
- stsClient.getRequestContext().put(SecurityConstants.PASSWORD,
"abcd!1234");
//TODO: get the Trust10 token out of the port
//Trust10 trust = ......
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=725792&r1=725791&r2=725792&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
(original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml Thu Dec
11 11:40:51 2008
@@ -24,6 +24,18 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
+
+ <bean id="default.sts-client"
class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+ <property name="soap11" value="false"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.password" value="abcd!1234"/>
+ </map>
+ </property>
+ </bean>
+
+
<http:conduit
name="https://131.107.72.15/Security_Federation_FederatedService_Indigo/Symmetric.svc/Scenario_1_IssuedTokenOverTransport_UsernameOverTransport.*";>
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
