cxf git commit: Add initial support for a SAML SSO Metadata service

2015-04-15 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes f7c0e6279 - 06696d589


Add initial support for a SAML SSO Metadata service

Conflicts:

rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java


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

Branch: refs/heads/3.0.x-fixes
Commit: 06696d589fbba7af84994392ffb67def0096c2a3
Parents: f7c0e62
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Apr 14 17:16:16 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 16:35:39 2015 +0100

--
 .../security/saml/sso/AbstractSSOSpHandler.java |  19 ++
 .../saml/sso/AbstractServiceProviderFilter.java |  18 --
 .../rs/security/saml/sso/MetadataService.java   | 104 
 .../rs/security/saml/sso/MetadataWriter.java| 263 +++
 .../cxf/rs/security/saml/sso/SSOConstants.java  |   6 +
 5 files changed, 392 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/06696d58/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
index f839620..84c34ee 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
@@ -50,6 +50,7 @@ public class AbstractSSOSpHandler {
 private String signaturePropertiesFile;
 private CallbackHandler callbackHandler;
 private String callbackHandlerClass;
+private String signatureUsername;
 
 static {
 OpenSAMLUtil.initSamlEngine();
@@ -243,4 +244,22 @@ public class AbstractSSOSpHandler {
 }
 return handler;
 }
+
+/**
+ * Set the username/alias to use to sign any request
+ * @param signatureUsername the username/alias to use to sign any request
+ */
+public void setSignatureUsername(String signatureUsername) {
+this.signatureUsername = signatureUsername;
+LOG.fine(Setting signatureUsername:  + signatureUsername);
+}
+ 
+/**
+ * Get the username/alias to use to sign any request
+ * @return the username/alias to use to sign any request
+ */
+public String getSignatureUsername() {
+return signatureUsername;
+}
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/06696d58/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
index e96566a..2ab978d 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
@@ -78,7 +78,6 @@ public abstract class AbstractServiceProviderFilter extends 
AbstractSSOSpHandler
 private String assertionConsumerServiceAddress;
 private AuthnRequestBuilder authnRequestBuilder = new 
DefaultAuthnRequestBuilder();
 private boolean signRequest;
-private String signatureUsername;
 
 private String webAppDomain;
 private boolean addWebAppContext = true;
@@ -117,23 +116,6 @@ public abstract class AbstractServiceProviderFilter 
extends AbstractSSOSpHandler
 return idpServiceAddress;
 }
 
-/**
- * Set the username/alias to use to sign any request
- * @param signatureUsername the username/alias to use to sign any request
- */
-public void setSignatureUsername(String signatureUsername) {
-this.signatureUsername = signatureUsername;
-LOG.fine(Setting signatureUsername:  + signatureUsername);
-}
-
-/**
- * Get the username/alias to use to sign any request
- * @return the username/alias to use to sign any request
- */
-public String getSignatureUsername() {
-return signatureUsername;
-}
-
 @PreDestroy
 public void close() {
 super.close();

cxf git commit: Add initial support for a SAML SSO Metadata service

2015-04-14 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master e5d98fd24 - bc752dc5b


Add initial support for a SAML SSO Metadata service


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

Branch: refs/heads/master
Commit: bc752dc5bd89b5d70d00435fc1185e72659d7e4d
Parents: e5d98fd
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Apr 14 17:16:16 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Apr 14 17:16:16 2015 +0100

--
 .../security/saml/sso/AbstractSSOSpHandler.java |  18 ++
 .../saml/sso/AbstractServiceProviderFilter.java |  18 --
 .../rs/security/saml/sso/MetadataService.java   | 104 
 .../rs/security/saml/sso/MetadataWriter.java| 263 +++
 .../cxf/rs/security/saml/sso/SSOConstants.java  |   6 +
 5 files changed, 391 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bc752dc5/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
index 6c02ed3..dd0a516 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
@@ -46,6 +46,7 @@ public class AbstractSSOSpHandler {
 private String signaturePropertiesFile;
 private CallbackHandler callbackHandler;
 private String callbackHandlerClass;
+private String signatureUsername;
 
 static {
 OpenSAMLUtil.initSamlEngine();
@@ -185,4 +186,21 @@ public class AbstractSSOSpHandler {
 return callbackHandler;
 }
 
+/**
+ * Set the username/alias to use to sign any request
+ * @param signatureUsername the username/alias to use to sign any request
+ */
+public void setSignatureUsername(String signatureUsername) {
+this.signatureUsername = signatureUsername;
+LOG.fine(Setting signatureUsername:  + signatureUsername);
+}
+
+/**
+ * Get the username/alias to use to sign any request
+ * @return the username/alias to use to sign any request
+ */
+public String getSignatureUsername() {
+return signatureUsername;
+}
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/bc752dc5/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
index ac64188..fe9ef86 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
@@ -79,7 +79,6 @@ public abstract class AbstractServiceProviderFilter extends 
AbstractSSOSpHandler
 private String assertionConsumerServiceAddress;
 private AuthnRequestBuilder authnRequestBuilder = new 
DefaultAuthnRequestBuilder();
 private boolean signRequest;
-private String signatureUsername;
 
 private String webAppDomain;
 private boolean addWebAppContext = true;
@@ -118,23 +117,6 @@ public abstract class AbstractServiceProviderFilter 
extends AbstractSSOSpHandler
 return idpServiceAddress;
 }
 
-/**
- * Set the username/alias to use to sign any request
- * @param signatureUsername the username/alias to use to sign any request
- */
-public void setSignatureUsername(String signatureUsername) {
-this.signatureUsername = signatureUsername;
-LOG.fine(Setting signatureUsername:  + signatureUsername);
-}
-
-/**
- * Get the username/alias to use to sign any request
- * @return the username/alias to use to sign any request
- */
-public String getSignatureUsername() {
-return signatureUsername;
-}
-
 @PreDestroy
 public void close() {
 super.close();

http://git-wip-us.apache.org/repos/asf/cxf/blob/bc752dc5/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java