cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/3] git commit: Uncommenting some stuff after picking up WSS4J 2.0.0-SNAPSHOT
Date Wed, 19 Feb 2014 17:55:37 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 8a3219071 -> 09f8068a1


Uncommenting some stuff after picking up WSS4J 2.0.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/076b258c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/076b258c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/076b258c

Branch: refs/heads/master
Commit: 076b258c21ab784322b7231718efba6e0f941fae
Parents: 994fd70
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Feb 19 14:59:28 2014 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Feb 19 14:59:28 2014 +0000

----------------------------------------------------------------------
 .../org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/076b258c/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
index 9213b3c..bcff1aa 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
@@ -178,9 +178,8 @@ public class XmlSecOutInterceptor implements PhaseInterceptor<Message>
{
             
             properties.setEncryptionUseThisCertificate(sendingCert);
             
-            // TODO Uncomment
-            //properties.setEncryptionKeyIdentifier(
-            //    convertKeyIdentifier(encryptionProperties.getEncryptionKeyIdType()));
+            properties.setEncryptionKeyIdentifier(
+                convertKeyIdentifier(encryptionProperties.getEncryptionKeyIdType()));
                                       
             if (encryptionProperties.getEncryptionKeyTransportAlgo() != null) {
                 properties.setEncryptionKeyTransportAlgorithm(


Mime
View raw message