You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/09/12 13:58:55 UTC

[1/2] git commit: updated refs/heads/master to aeec24b

Repository: cloudstack
Updated Branches:
  refs/heads/master d90a2d396 -> aeec24b2c


developer: enable saml plugin for developers by default

Deploydb with a -P developer profile will run developer-prefill, in that we
enable the SAML plugin by default but only for developers

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


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

Branch: refs/heads/master
Commit: 3df104e20d12de97f4733876e9126c1267c341af
Parents: d90a2d3
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Sep 12 13:40:20 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Sep 12 13:40:20 2014 +0200

----------------------------------------------------------------------
 developer/developer-prefill.sql | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3df104e2/developer/developer-prefill.sql
----------------------------------------------------------------------
diff --git a/developer/developer-prefill.sql b/developer/developer-prefill.sql
index 7b423a1..5cd0a6d 100644
--- a/developer/developer-prefill.sql
+++ b/developer/developer-prefill.sql
@@ -63,4 +63,9 @@ INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
             VALUES ('Advanced', 'DEFAULT', 'management-server',
             'developer', 'true');
 
+-- Enable SAML plugin for developers by default
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
+            VALUES ('Advanced', 'DEFAULT', 'management-server',
+            'saml2.enabled', 'true');
+
 commit;


[2/2] git commit: updated refs/heads/master to aeec24b

Posted by bh...@apache.org.
SAMLMetaDataResponse: this should extend AuthenticationCmdResponse

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


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

Branch: refs/heads/master
Commit: aeec24b2ca1be67f49347454a80b35ef7d6c8f83
Parents: 3df104e
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Sep 12 13:58:21 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Sep 12 13:58:39 2014 +0200

----------------------------------------------------------------------
 .../org/apache/cloudstack/api/response/SAMLMetaDataResponse.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeec24b2/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/SAMLMetaDataResponse.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/SAMLMetaDataResponse.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/SAMLMetaDataResponse.java
index e091ea4..cc43b98 100644
--- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/SAMLMetaDataResponse.java
+++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/response/SAMLMetaDataResponse.java
@@ -18,9 +18,8 @@ package org.apache.cloudstack.api.response;
 
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
-public class SAMLMetaDataResponse extends BaseResponse {
+public class SAMLMetaDataResponse extends AuthenticationCmdResponse {
 
     @SerializedName("metadata")
     @Param(description = "The Metadata XML")