cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1095661 - in /cxf/trunk/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java resources/org/apache/cxf/systest/ws/saml/client/client.xml
Date Thu, 21 Apr 2011 11:38:36 GMT
Author: coheigea
Date: Thu Apr 21 11:38:36 2011
New Revision: 1095661

URL: http://svn.apache.org/viewvc?rev=1095661&view=rev
Log:
Some minor changes to the SAML systest config.

Modified:
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java?rev=1095661&r1=1095660&r2=1095661&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java
Thu Apr 21 11:38:36 2011
@@ -75,9 +75,8 @@ public class SamlCallbackHandler impleme
                 callback.setSubject(subjectBean);
                 
                 AttributeStatementBean attrBean = new AttributeStatementBean();
-                if (subjectBean != null) {
-                    attrBean.setSubject(subjectBean);
-                }
+                attrBean.setSubject(subjectBean);
+                
                 AttributeBean attributeBean = new AttributeBean();
                 attributeBean.setSimpleName("subject-role");
                 attributeBean.setAttributeValues(Collections.singletonList("system-user"));

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml?rev=1095661&r1=1095660&r2=1095661&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml
(original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml
Thu Apr 21 11:38:36 2011
@@ -53,36 +53,32 @@
     <jaxws:client name="{http://WSSec/saml}DoubleItSaml2SymmetricPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
            <entry key="ws-security.encryption.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
        </jaxws:properties>
     </jaxws:client>
     
-      <jaxws:client name="{http://WSSec/saml}DoubleItSaml2SymmetricSupportingPort" 
+    <jaxws:client name="{http://WSSec/saml}DoubleItSaml2SymmetricSupportingPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.callback-handler" 
-                  value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
            <entry key="ws-security.encryption.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
        </jaxws:properties>
-     </jaxws:client>  
+    </jaxws:client>  
    
     <jaxws:client name="{http://WSSec/saml}DoubleItSaml2AsymmetricPort" 
                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.encryption.username" value="alice"/>
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
            <entry key="ws-security.encryption.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
            <entry key="ws-security.encryption.username" value="bob"/>
            <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>

+                  value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+           <entry key="ws-security.signature.username" value="alice"/> 
        </jaxws:properties>
     </jaxws:client> 
 



Mime
View raw message