[2/2] cxf git commit: Add KeyName as KeyIdentifier. This closes #175

[coheigea]

Add KeyName as KeyIdentifier. This closes #175


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

Branch: refs/heads/3.0.x-fixes
Commit: 99412463dcd661eaba9bd84f4bb28865855e67aa
Parents: 1628431
Author: Hugo Trippaers 
Authored: Sat Oct 8 23:28:16 2016 +0200
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 10 17:14:37 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/99412463/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 16ac06f..1df8591 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
@@ -457,6 +457,8 @@ public class XmlSecOutInterceptor extends 
AbstractPhaseInterceptor {
 return SecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier;
 } else if ("KeyValue".equals(keyIdentifier)) {
 return SecurityTokenConstants.KeyIdentifier_KeyValue;
+} else if ("KeyName".equals(keyIdentifier)) {
+return SecurityTokenConstants.KeyIdentifier_KeyName;
 }
 return SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier;
 }

cxf git commit: Add KeyName as KeyIdentifier. This closes #175

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes f8a384f5a -> 2f530abd7


Add KeyName as KeyIdentifier. This closes #175


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

Branch: refs/heads/3.1.x-fixes
Commit: 2f530abd78774410b37d2ff07a69358795007f4d
Parents: f8a384f
Author: Hugo Trippaers 
Authored: Sat Oct 8 23:28:16 2016 +0200
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 10 17:11:12 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/2f530abd/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 7b7d982..1f5193d 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
@@ -434,6 +434,8 @@ public class XmlSecOutInterceptor extends 
AbstractPhaseInterceptor {
 return SecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier;
 } else if ("KeyValue".equals(keyIdentifier)) {
 return SecurityTokenConstants.KeyIdentifier_KeyValue;
+} else if ("KeyName".equals(keyIdentifier)) {
+return SecurityTokenConstants.KeyIdentifier_KeyName;
 }
 return SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier;
 }

cxf git commit: Add KeyName as KeyIdentifier. This closes #175

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 183a2a402 -> 9c5d9f77a


Add KeyName as KeyIdentifier. This closes #175


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

Branch: refs/heads/master
Commit: 9c5d9f77aac1de3789d3b7f08ca528174429dbba
Parents: 183a2a4
Author: Hugo Trippaers 
Authored: Sat Oct 8 23:28:16 2016 +0200
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 10 17:09:39 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/9c5d9f77/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 7b7d982..1f5193d 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
@@ -434,6 +434,8 @@ public class XmlSecOutInterceptor extends 
AbstractPhaseInterceptor {
 return SecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier;
 } else if ("KeyValue".equals(keyIdentifier)) {
 return SecurityTokenConstants.KeyIdentifier_KeyValue;
+} else if ("KeyName".equals(keyIdentifier)) {
+return SecurityTokenConstants.KeyIdentifier_KeyName;
 }
 return SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier;
 }