cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1496868 - in /cxf/branches/2.7.x-fixes: rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/ services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/
Date Wed, 26 Jun 2013 10:14:28 GMT
Author: coheigea
Date: Wed Jun 26 10:14:27 2013
New Revision: 1496868

URL: http://svn.apache.org/r1496868
Log:
Merged revisions 1496866 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1496866 | coheigea | 2013-06-26 11:10:19 +0100 (Wed, 26 Jun 2013) | 2 lines

  [CXF-4457] - Allow "non" ".sct" configuration values to work for SecureConversation

........

Modified:
    cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
    cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
    cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml

Modified: cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=1496868&r1=1496867&r2=1496868&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
Wed Jun 26 10:14:27 2013
@@ -194,6 +194,9 @@ class SecureConversationInInterceptor ex
         Exchange ex = message.getExchange();
         for (String s : SecurityConstants.ALL_PROPERTIES) {
             Object v = message.getContextualProperty(s + ".sct");
+            if (v == null) {
+                v = message.getContextualProperty(s);
+            }
             if (v != null) {
                 ex.put(s, v);
             }

Modified: cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java?rev=1496868&r1=1496867&r2=1496868&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
Wed Jun 26 10:14:27 2013
@@ -107,6 +107,9 @@ public class SecureConversationTokenInte
     private static void mapSecurityProps(Message message, Map<String, Object> ctx)
{
         for (String s : SecurityConstants.ALL_PROPERTIES) {
             Object v = message.getContextualProperty(s + ".sct");
+            if (v == null) {
+                v = message.getContextualProperty(s);
+            }
             if (v != null) {
                 ctx.put(s, v);
             }

Modified: cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml?rev=1496868&r1=1496867&r2=1496868&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml
(original)
+++ cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml
Wed Jun 26 10:14:27 2013
@@ -96,10 +96,10 @@
       xmlns:s="http://www.example.org/contract/DoubleIt">
         
       <jaxws:properties>
-         <entry key="ws-security.callback-handler.sct" 
+         <entry key="ws-security.callback-handler" 
                 value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-         <entry key="ws-security.signature.properties.sct" value="serviceKeystore.properties"/>
-         <entry key="ws-security.is-bsp-compliant.sct" value="false"/>
+         <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+         <entry key="ws-security.is-bsp-compliant" value="false"/>
       </jaxws:properties> 
    </jaxws:endpoint>
    



Mime
View raw message