You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2011/03/21 14:19:31 UTC

svn commit: r1083773 - /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java

Author: coheigea
Date: Mon Mar 21 13:19:30 2011
New Revision: 1083773

URL: http://svn.apache.org/viewvc?rev=1083773&view=rev
Log:
Using constant names instead of values for setting crypto properties.

Modified:
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1083773&r1=1083772&r2=1083773&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java Mon Mar 21 13:19:30 2011
@@ -249,14 +249,14 @@ public class PolicyBasedWSS4JInIntercept
                 Object s = message.getContextualProperty(SecurityConstants.SIGNATURE_PROPERTIES);
                 Object e = message.getContextualProperty(SecurityConstants.ENCRYPT_PROPERTIES);
                 if (s != null) {
-                    message.put("decryptionPropRefId", "RefId-" + s.toString());
+                    message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + s.toString());
                     message.put("RefId-" + s.toString(), getProps(s, message));
                     if (e == null) {
                         e = s;
                     }
                 }
                 if (e != null) {
-                    message.put("SignaturePropRefId", "RefId-" + e.toString());
+                    message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + e.toString());
                     message.put("RefId-" + e.toString(), getProps(e, message));
                 }
             }
@@ -284,14 +284,14 @@ public class PolicyBasedWSS4JInIntercept
                     Object s = message.getContextualProperty(SecurityConstants.SIGNATURE_PROPERTIES);
                     Object e = message.getContextualProperty(SecurityConstants.ENCRYPT_PROPERTIES);
                     if (s != null) {
-                        message.put("decryptionPropRefId", "RefId-" + s.toString());
+                        message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + s.toString());
                         message.put("RefId-" + s.toString(), getProps(s, message));
                         if (e == null) {
                             e = s;
                         }
                     }
                     if (e != null) {
-                        message.put("SignaturePropRefId", "RefId-" + e.toString());
+                        message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + e.toString());
                         message.put("RefId-" + e.toString(), getProps(e, message));
                     }
                 }
@@ -325,20 +325,20 @@ public class PolicyBasedWSS4JInIntercept
                 }
                 if (isRequestor(message)) {
                     if (e != null) {
-                        message.put("SignaturePropRefId", "RefId-" + e.toString());
+                        message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + e.toString());
                         message.put("RefId-" + e.toString(), getProps(e, message));
                     }
                     if (s != null) {
-                        message.put("decryptionPropRefId", "RefId-" + s.toString());
+                        message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + s.toString());
                         message.put("RefId-" + s.toString(), getProps(s, message));
                     }
                 } else {
                     if (s != null) {
-                        message.put("SignaturePropRefId", "RefId-" + s.toString());
+                        message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + s.toString());
                         message.put("RefId-" + s.toString(), getProps(s, message));
                     }
                     if (e != null) {
-                        message.put("decryptionPropRefId", "RefId-" + e.toString());
+                        message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + e.toString());
                         message.put("RefId-" + e.toString(), getProps(e, message));
                     }
                 }