Return-Path: 
 <commits-return-7614-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 45437 invoked from network); 2 Mar 2009 19:32:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 2 Mar 2009 19:32:27 -0000
Received: (qmail 57925 invoked by uid 500); 2 Mar 2009 19:32:27 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 57805 invoked by uid 500); 2 Mar 2009 19:32:27 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 57796 invoked by uid 99); 2 Mar 2009 19:32:27 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2009 11:32:27 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2009 19:32:18 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5100A23889B2; Mon,  2 Mar 2009 19:31:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090302193158.5100A23889B2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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"