cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r749422 - in /cxf/sandbox/interopfest/wstrust10/src/main: java/interop/client/Client.java resources/etc/client.xml
Date Mon, 02 Mar 2009 19:31:58 GMT
Author: dkulp
Date: Mon Mar  2 19:31:57 2009
New Revision: 749422

URL: http://svn.apache.org/viewvc?rev=749422&view=rev
Log:
Get another test working

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=749422&r1=749421&r2=749422&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 Mon Mar  2
19:31:57 2009
@@ -77,14 +77,14 @@
                 //"Scenario_1_IssuedTokenOverTransport_UsernameOverTransport", // [1]
                 "Scenario_2_IssuedToken_MutualCertificate10",
                 "Scenario_5_IssuedTokenForCertificate_MutualCertificate11",
-                //"Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11",
//[2]        
+                "Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11",
       
                                  
-                //"Scenario_7_IssuedTokenOverTransport_UsernameOverTransport", //[3]
-                //"Scenario_9_IssuedTokenForCertificate_MutualCertificate11", // [3]
-                //"Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11",
//[3]
+                //"Scenario_7_IssuedTokenOverTransport_UsernameOverTransport", //[2]
+                //"Scenario_9_IssuedTokenForCertificate_MutualCertificate11", // [2]
+                //"Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11",
//[2]
             };
         }
-        //argv = new String[] {argv[2]};
+        argv = new String[] {argv[2]};
 
         new SpringBusFactory().createBus("etc/client.xml");
         List<String> results = new ArrayList<String>(argv.length);
@@ -134,8 +134,7 @@
 /*
 [1] - The STS is not return a SAML assertion.   It's some bizarre "EncryptedData" element.
 Need to 
       investigate what to do.
-[2] - Mix of Trust and SC
-[3] - RSA KeyValue / Public key thing (not supported by wss4j yet)
-[4] - WSS4J or xml-sec is not able to validate the returned signature from the STS.   The
key ref
+[2] - RSA KeyValue / Public key thing (not supported by wss4j yet)
+[3] - WSS4J or xml-sec is not able to validate the returned signature from the STS.   The
key ref
       finds the wssip key/alias in the keystore, just the sig doesn't seem valid
 */
\ No newline at end of file

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=749422&r1=749421&r2=749422&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml (original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml Mon Mar  2 19:31:57
2009
@@ -75,7 +75,27 @@
         </jaxws:properties>
     </jaxws:client>
     
-    
+    <!-- Scenario 6 -->    
+    <bean name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11.sct-client.sts-client"
+    	class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+    	<property name="wsdlLocation" value="target/wsdl2/STSSym.wsdl"/>
+    	<property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
+    	<property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1"/>
+    	<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.encryption.properties" value="etc/wssip.properties"/>

+    		</map>
+    	</property>
+    </bean>
+    <jaxws:client name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11"
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"/>

+        </jaxws:properties>
+    </jaxws:client>
+        
     
     <!-- Scenario 7 -->    
     <bean name="{http://tempuri.org/}Scenario_7_IssuedTokenOverTransport_UsernameOverTransport.sts-client"




Mime
View raw message