Author: dkulp
Date: Thu Mar 12 18:57:24 2009
New Revision: 752971

URL: http://svn.apache.org/viewvc?rev=752971&view=rev
Log:
[CXF-2111] More updates from Eamonn to get more tests passing

Modified:
    cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/Client.java
    cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml

Modified: 
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/Client.java
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/Client.java?rev=752971&r1=752970&r2=752971&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/Client.java 
(original)
+++ cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/Client.java 
Thu Mar 12 18:57:24 2009
@@ -49,17 +49,18 @@
         if (argv.length < 1) {
             argv = new String[] {
                 "CustomBinding_IPingServiceContract",
-                //"OasisScenario2Binding_IPingServiceContract",  //NOT_WORKING
+                "OasisScenario2Binding_IPingServiceContract",  
                 "CustomBinding_IPingServiceContract1",
                 "OasisScenario4Binding_IPingServiceContract",
-                //"CustomBinding_IPingServiceContract2", //NOT WORKING  [1]
-                //"CustomBinding_IPingServiceContract3", //NOT WORKING  [1]
-                //"CustomBinding_IPingServiceContract4", //NOT WORKING -[2]
-                //"CustomBinding_IPingServiceContract6", //NOT WORKING - 
SecureConversation
-                //"CustomBinding_IPingServiceContract5", //NOT WORKING -[2]
-                //"CustomBinding_IPingServiceContract7", //NOT WORKING - 
service not running on given port
-                //"CustomBinding_IPingServiceContract8", //Hanging?
-                //"CustomBinding_IPingServiceContract9", //NOT WORKING - 
SecureConversation
+                "CustomBinding_IPingServiceContract2", 
+//                "CustomBinding_IPingServiceContract3", //NOT WORKING - [1]
+                "CustomBinding_IPingServiceContract4", 
+//                "CustomBinding_IPingServiceContract6", //NOT WORKING
+//                "CustomBinding_IPingServiceContract5", //NOT WORKING -[2]
+//                "CustomBinding_IPingServiceContract7", //NOT WORKING - 
service not running on given port
+//                "CustomBinding_IPingServiceContract8", //Hanging?
+//                "CustomBinding_IPingServiceContract9", //NOT WORKING
+                "CustomBinding_IPingServiceContract10",
             };
         }
         //argv = new String[] {argv[3]};

Modified: cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml?rev=752971&r1=752970&r2=752971&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml 
(original)
+++ cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml Thu Mar 
12 18:57:24 2009
@@ -25,20 +25,7 @@
         </cxf:features>
     </cxf:bus>
     
-
-    <!-- Configure based on the endpoint name -->    
-    <bean 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract.sts-client"; 
-       class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
-       <property name="wsdlLocation" value="target/wsdl2/trust.wsdl"/>
-       <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
-       <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync"/>
-       <property name="properties">
-               <map>
-                       <entry key="ws-security.username" value="joe"/>
-                       <entry key="ws-security.password" value="eoj"/>
-               </map>
-       </property>
-    </bean>
+ 
     
     <!-- Configure based on a reference to an actual defined STSClient bean -->
     <bean id="OasisScenario4Binding_IPingServiceContract-sts" 
@@ -57,66 +44,55 @@
     </bean>
          
         
-        <!-- 
-    <bean id="OasisScenario2Binding_IPingServiceContract" 
-       class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
-       <property name="wsdlLocation" value="target/wsdl2/trust.wsdl"/>
-       <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
-       <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync"/>
-       <property name="properties">
-               <map>
-                       <entry key="ws-security.username" value="joe"/>
-                       <entry key="ws-security.password" value="eoj"/>
-               </map>
-       </property>
-    </bean>
-    <bean id="CustomBinding_IPingServiceContract1" 
-       class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
-       <property name="wsdlLocation" value="target/wsdl2/trust.wsdl"/>
-       <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
-       <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync2"/>
-       <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/bob.properties"/> 
-               </map>
-       </property>
-    </bean>
-    <bean id="OasisScenario4Binding_IPingServiceContract" 
-       class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
-       <property name="wsdlLocation" value="target/wsdl2/trust.wsdl"/>
-       <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
-       <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync3"/>
-       <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>
-    <alias name="CustomBinding_IPingServiceContract" 
alias="CustomBinding_IPingServiceContract4" />
-    <alias name="CustomBinding_IPingServiceContract" 
alias="CustomBinding_IPingServiceContract7" />
-    -->
+    <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract"; 
createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.sts.client">
+                <!-- direct STSClient config and creation -->
+                           <bean 
class="org.apache.cxf.ws.security.trust.STSClient">
+                               <constructor-arg ref="cxf"/>
+                               <property name="wsdlLocation" 
value="target/wsdl2/trust.wsdl"/>
+                               <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
+                               <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync"/>
+                               <property name="properties">
+                                       <map>
+                                               <entry 
key="ws-security.username" value="joe"/>
+                                               <entry 
key="ws-security.password" value="eoj"/>
+                                                       <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/bob.properties"/>            
                                 
+                                       </map>
+                               </property>
+                           </bean>            
+            </entry> 
+        </jaxws:properties>
+    </jaxws:client>
     
-    <bean id="CustomBinding_IPingServiceContract2" 
-       class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
-       <property name="wsdlLocation" value="target/wsdl2/trust.wsdl"/>
-       <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
-       <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync1"/>
-       <property name="properties">
-               <map>
-               <entry key="ws-security.callback-handler" 
value="interop.client.KeystorePasswordCallback"/>
-               <entry key="ws-security.encryption.properties" 
value="etc/wssip.properties"/> 
-               <entry key="ws-security.signature.properties" 
value="etc/alice.properties"/> 
-               </map>
-       </property>
-    </bean>    
-    <alias name="CustomBinding_IPingServiceContract2" 
alias="{http://tempuri.org/}CustomBinding_IPingServiceContract8.sts-client"; />
     
     <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract1"; 
createdFromAPI="true">
         <jaxws:properties>
+            <entry key="ws-security.sts.client">
+                <!-- direct STSClient config and creation -->
+                           <bean 
class="org.apache.cxf.ws.security.trust.STSClient">
+                               <constructor-arg ref="cxf"/>
+                               <property name="wsdlLocation" 
value="target/wsdl2/trust.wsdl"/>
+                               <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
+                               <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync"/>
+                               <property name="properties">
+                                       <map>
+                                               <entry 
key="ws-security.username" value="joe"/>
+                                               <entry 
key="ws-security.password" value="eoj"/>
+                                                       <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/bob.properties"/>            
                                 
+                                       </map>
+                               </property>
+                           </bean>            
+            </entry> 
+        </jaxws:properties>
+    </jaxws:client>
+    
+   <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract2"; 
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.sts.client">
@@ -130,56 +106,230 @@
                                        <map>
                                                <entry 
key="ws-security.username" value="joe"/>
                                                <entry 
key="ws-security.password" value="eoj"/>
+                                                       <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/bob.properties"/>            
                                 
                                        </map>
                                </property>
                            </bean>            
             </entry> 
         </jaxws:properties>
-    </jaxws:client>
+    </jaxws:client>    
     
-    <jaxws:client 
name="{http://tempuri.org/}OasisScenario4Binding_IPingServiceContract"; 
createdFromAPI="true">
+    <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract3"; 
createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="interop.client.KeystorePasswordCallback"/>
-            <!-- STS config by reference -->
-            <entry key="ws-security.sts.client" 
value-ref="OasisScenario4Binding_IPingServiceContract-sts"/>
+            <entry key="ws-security.encryption.properties" 
value="etc/bob.properties"/> 
+            <entry key="ws-security.sts.client">
+                <!-- direct STSClient config and creation -->
+                           <bean 
class="org.apache.cxf.ws.security.trust.STSClient">
+                               <constructor-arg ref="cxf"/>
+                               <property name="wsdlLocation" 
value="target/wsdl2/trust.wsdl"/>
+                               <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
+                               <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync"/>
+                               <property name="properties">
+                                       <map>
+                                               <entry 
key="ws-security.username" value="joe"/>
+                                               <entry 
key="ws-security.password" value="eoj"/>
+                                                       <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/bob.properties"/>     
+                                               <entry 
key="ws-security.sts.token.properties" value="etc/bob.properties"/>
+                                       </map>
+                               </property>
+                           </bean>            
+            </entry> 
         </jaxws:properties>
-    </jaxws:client>
+    </jaxws:client>  
+    
     
     
-    <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract2"; 
createdFromAPI="true">
+    <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract4"; 
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.signature.properties.sct" 
value="etc/alice.properties"/>
+            <entry key="ws-security.encryption.properties.sct" 
value="etc/bob.properties"/>            
         </jaxws:properties>
     </jaxws:client>
     
+   <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract5"; 
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.sts.client">
+                <!-- direct STSClient config and creation -->
+                           <bean 
class="org.apache.cxf.ws.security.trust.STSClient">
+                               <constructor-arg ref="cxf"/>
+                               <property name="wsdlLocation" 
value="target/wsdl2/trust.wsdl"/>
+                               <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
+                               <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync"/>
+                               <property name="properties">
+                                       <map>
+                                               <entry 
key="ws-security.username" value="joe"/>
+                                               <entry 
key="ws-security.password" value="eoj"/>
+                                                       <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/bob.properties"/>     
+                                               <entry 
key="ws-security.sts.token.properties" value="etc/bob.properties"/>
+                                       </map>
+                               </property>
+                           </bean>            
+            </entry> 
+        </jaxws:properties>
+    </jaxws:client>  
     
-    <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract8"; 
createdFromAPI="true">
+    <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract6"; 
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.encryption.properties" 
value="etc/bob.properties"/> 
+            <entry key="ws-security.sts.client">
+                <!-- direct STSClient config and creation -->
+                           <bean 
class="org.apache.cxf.ws.security.trust.STSClient">
+                               <constructor-arg ref="cxf"/>
+                               <property name="wsdlLocation" 
value="target/wsdl2/trust.wsdl"/>
+                               <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
+                               <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync"/>
+                               <property name="properties">
+                                       <map>
+                                               <entry 
key="ws-security.username" value="joe"/>
+                                               <entry 
key="ws-security.password" value="eoj"/>
+                                                       <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/bob.properties"/>     
+                                               <entry 
key="ws-security.sts.token.properties" value="etc/bob.properties"/>
+                                       </map>
+                               </property>
+                           </bean>            
+            </entry> 
         </jaxws:properties>
-    </jaxws:client>    
+    </jaxws:client>   
 
-    <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract3"; 
createdFromAPI="true">
+    <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract7"; 
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.signature.properties.sct" 
value="etc/alice.properties"/>
+            <entry key="ws-security.encryption.properties.sct" 
value="etc/bob.properties"/>
+            
         </jaxws:properties>
-    </jaxws:client>    
-    <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract6"; 
createdFromAPI="true">
+    </jaxws:client> 
+    
+    <bean 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract7.sct-client.sts-client";
 
+       class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+       <property name="wsdlLocation" value="target/wsdl2/trust.wsdl"/>
+       <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
+       <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync"/>
+       <property name="properties">
+               <map>
+                       <entry key="ws-security.username" value="joe"/>
+                       <entry key="ws-security.password" value="eoj"/>
+               <entry key="ws-security.signature.properties" 
value="etc/alice.properties"/> 
+                       <entry key="ws-security.encryption.properties" 
value="etc/bob.properties"/>     
+               <entry key="ws-security.sts.token.properties" 
value="etc/bob.properties"/>  
+               <entry key="ws-security.callback-handler" 
value="interop.client.KeystorePasswordCallback"/>
+               </map>
+       </property>
+    </bean>  
+    
+
+    <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract8"; 
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.encryption.properties" 
value="etc/bob.properties"/> 
+            <entry key="ws-security.sts.client">
+                <!-- direct STSClient config and creation -->
+                           <bean 
class="org.apache.cxf.ws.security.trust.STSClient">
+                               <constructor-arg ref="cxf"/>
+                               <property name="wsdlLocation" 
value="target/wsdl2/trust.wsdl"/>
+                               <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
+                               <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync"/>
+                               <property name="properties">
+                                       <map>
+                                               <entry 
key="ws-security.username" value="joe"/>
+                                               <entry 
key="ws-security.password" value="eoj"/>
+                                                       <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/bob.properties"/>     
+                                               <entry 
key="ws-security.sts.token.properties" value="etc/bob.properties"/>
+                                       </map>
+                               </property>
+                           </bean>            
+            </entry> 
         </jaxws:properties>
-    </jaxws:client> 
+    </jaxws:client>   
+
+
     <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract9"; 
createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="interop.client.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" 
value="etc/alice.properties"/>
+            <entry key="ws-security.encryption.properties" 
value="etc/bob.properties"/> 
+            <entry key="ws-security.sts.client">
+                <!-- direct STSClient config and creation -->
+                           <bean 
class="org.apache.cxf.ws.security.trust.STSClient">
+                               <constructor-arg ref="cxf"/>
+                               <property name="wsdlLocation" 
value="target/wsdl2/trust.wsdl"/>
+                               <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
+                               <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync"/>
+                               <property name="properties">
+                                       <map>
+                                               <entry 
key="ws-security.username" value="joe"/>
+                                               <entry 
key="ws-security.password" value="eoj"/>
+                                                       <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/bob.properties"/>     
+                                               <entry 
key="ws-security.sts.token.properties" value="etc/bob.properties"/>
+                                       </map>
+                               </property>
+                           </bean>            
+            </entry> 
         </jaxws:properties>
-    </jaxws:client> 
+    </jaxws:client>   
+    
+   <jaxws:client 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract10"; 
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.sts.client">
+                <!-- direct STSClient config and creation -->
+                           <bean 
class="org.apache.cxf.ws.security.trust.STSClient">
+                               <constructor-arg ref="cxf"/>
+                               <property name="wsdlLocation" 
value="target/wsdl2/trust.wsdl"/>
+                               <property name="serviceName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
+                               <property name="endpointName" 
value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync"/>
+                               <property name="properties">
+                                       <map>
+                                               <entry 
key="ws-security.username" value="joe"/>
+                                               <entry 
key="ws-security.password" value="eoj"/>
+                                                       <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/bob.properties"/>     
+                                               <entry 
key="ws-security.sts.token.properties" value="etc/bob.properties"/>
+                                       </map>
+                               </property>
+                           </bean>            
+            </entry> 
+        </jaxws:properties>
+    </jaxws:client>      
     
+    <jaxws:client 
name="{http://tempuri.org/}OasisScenario4Binding_IPingServiceContract"; 
createdFromAPI="true">
+        <jaxws:properties>
+            <!-- STS config by reference -->
+            <entry key="ws-security.sts.client" 
value-ref="OasisScenario4Binding_IPingServiceContract-sts"/>
+        </jaxws:properties>
+    </jaxws:client>
+    
+    
+    <jaxws:client 
name="{http://tempuri.org/}OasisScenario2Binding_IPingServiceContract"; 
createdFromAPI="true">
+        <jaxws:properties>
+            <!-- STS config by reference -->
+            <entry key="ws-security.sts.client" 
value-ref="OasisScenario4Binding_IPingServiceContract-sts"/>
+        </jaxws:properties>
+    </jaxws:client>
+   
+
      
     <http:conduit name="https://131.107.72.15/.*";>
         <http:tlsClientParameters disableCNCheck="true">
@@ -191,6 +341,8 @@
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>
+    
+    <!--
     <http:conduit name="https://131.107.153.205/.*";>
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
@@ -213,4 +365,31 @@
         </http:tlsClientParameters>
         <http:client Connection="close" AllowChunking="false"/>
     </http:conduit>
+    
+    <http:conduit 
name="{http://tempuri.org/}CustomBinding_IPingServiceContract.http-conduit";>
+        <http:tlsClientParameters disableCNCheck="true">
+            <sec:keyManagers keyPassword="password">
+                <sec:keyStore type="pkcs12" password="password" 
resource="certs/alice.pfx"/>
+            </sec:keyManagers>
+            <sec:trustManagers>
+                <sec:keyStore type="pkcs12" password="password" 
resource="certs/WssIP.pfx"/>
+            </sec:trustManagers>
+        </http:tlsClientParameters>
+        <http:client Connection="close" AllowChunking="false"/>
+    </http:conduit>
+    -->
+    
+    <http:conduit name="*.http-conduit">
+        <http:tlsClientParameters disableCNCheck="true">
+            <sec:keyManagers keyPassword="password">
+                <sec:keyStore type="pkcs12" password="password" 
resource="certs/alice.pfx"/>
+            </sec:keyManagers>
+            <sec:trustManagers>
+                <sec:keyStore type="pkcs12" password="password" 
resource="certs/WssIP.pfx"/>
+            </sec:trustManagers>
+        </http:tlsClientParameters>
+        <http:client Connection="close" AllowChunking="false" 
ConnectionTimeout="0"
+            ReceiveTimeout="0"/>
+    </http:conduit>    
+    
 </beans>


Reply via email to