Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a754efae Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a754efae Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a754efae Branch: refs/heads/3.1.x-fixes Commit: a754efaefd486e23587fe671dfbcd5955312bf92 Parents: 6ffbba8 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Tue Mar 28 17:33:05 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Tue Mar 28 17:33:05 2017 +0100 ---------------------------------------------------------------------- .../apache/cxf/rs/security/xml/EncryptionProperties.java | 8 -------- .../apache/cxf/rs/security/xml/SignatureProperties.java | 8 -------- .../apache/cxf/rs/security/xml/XmlSecOutInterceptor.java | 10 ---------- 3 files changed, 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a754efae/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java index 4a5ab1d..4de9e8e 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java @@ -25,12 +25,8 @@ public class EncryptionProperties { private String encryptionSymmetricKeyAlgo; private String encryptionDigestAlgo; private String encryptionKeyIdType; -<<<<<<< HEAD - -======= private String encryptionKeyName; ->>>>>>> b30d620... CXF-7084 - Pass a value for the KeyName element from the XmlSecOutInterceptor to Santuario public void setEncryptionKeyTransportAlgo(String encryptionKeyTransportAlgo) { this.encryptionKeyTransportAlgo = encryptionKeyTransportAlgo; } @@ -55,9 +51,6 @@ public class EncryptionProperties { public String getEncryptionKeyIdType() { return encryptionKeyIdType; } -<<<<<<< HEAD - -======= public String getEncryptionKeyName() { return encryptionKeyName; } @@ -65,5 +58,4 @@ public class EncryptionProperties { this.encryptionKeyName = encryptionKeyName; } ->>>>>>> b30d620... CXF-7084 - Pass a value for the KeyName element from the XmlSecOutInterceptor to Santuario } http://git-wip-us.apache.org/repos/asf/cxf/blob/a754efae/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java index 16aff78..8c861ab 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java @@ -24,12 +24,8 @@ public class SignatureProperties { private String signatureC14nMethod; private String signatureC14nTransform; private String signatureKeyIdType; -<<<<<<< HEAD - -======= private String signatureKeyName; ->>>>>>> b30d620... CXF-7084 - Pass a value for the KeyName element from the XmlSecOutInterceptor to Santuario public void setSignatureAlgo(String signatureAlgo) { this.signatureAlgo = signatureAlgo; } @@ -76,9 +72,6 @@ public class SignatureProperties { public void setSignatureKeyIdType(String signatureKeyIdType) { this.signatureKeyIdType = signatureKeyIdType; } -<<<<<<< HEAD - -======= public String getSignatureKeyName() { return signatureKeyName; } @@ -86,5 +79,4 @@ public class SignatureProperties { this.signatureKeyName = signatureKeyName; } ->>>>>>> b30d620... CXF-7084 - Pass a value for the KeyName element from the XmlSecOutInterceptor to Santuario } http://git-wip-us.apache.org/repos/asf/cxf/blob/a754efae/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 b821eca..9018772 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 @@ -160,14 +160,8 @@ public class XmlSecOutInterceptor extends AbstractPhaseInterceptor<Message> { properties.setEncryptionKey(getSymmetricKey(symEncAlgo)); if (encryptSymmetricKey) { X509Certificate sendingCert = null; -<<<<<<< HEAD - String userName = - (String)org.apache.cxf.rt.security.utils.SecurityUtils.getSecurityPropertyValue( - SecurityConstants.ENCRYPT_USERNAME, message); -======= String userName = (String)SecurityUtils.getSecurityPropertyValue(SecurityConstants.ENCRYPT_USERNAME, message); ->>>>>>> b30d620... CXF-7084 - Pass a value for the KeyName element from the XmlSecOutInterceptor to Santuario if (RSSecurityUtils.USE_REQUEST_SIGNATURE_CERT.equals(userName) && !MessageUtils.isRequestor(message)) { sendingCert = @@ -199,13 +193,9 @@ public class XmlSecOutInterceptor extends AbstractPhaseInterceptor<Message> { properties.setEncryptionKeyIdentifier( convertKeyIdentifier(encryptionProperties.getEncryptionKeyIdType())); -<<<<<<< HEAD - -======= properties.setEncryptionKeyName(encryptionProperties.getEncryptionKeyName()); ->>>>>>> b30d620... CXF-7084 - Pass a value for the KeyName element from the XmlSecOutInterceptor to Santuario if (encryptionProperties.getEncryptionKeyTransportAlgo() != null) { properties.setEncryptionKeyTransportAlgorithm( encryptionProperties.getEncryptionKeyTransportAlgo());
