You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2014/11/05 11:45:16 UTC
[22/50] [abbrv] git commit: updated refs/heads/master to 4c5f792
saml: Use camelCase api names for SAML login/logout apis
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit 85c0bd68ae8a76c231ab402dd0311e3672155f71)
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/cd52bed4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd52bed4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd52bed4
Branch: refs/heads/master
Commit: cd52bed47759da13441b2f2a92c782907c2533dc
Parents: b701061
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Oct 30 23:15:05 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Oct 31 00:32:29 2014 +0530
----------------------------------------------------------------------
client/tomcatconf/commands.properties.in | 4 ++--
.../cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java | 2 +-
.../cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java | 2 +-
server/src/com/cloud/configuration/Config.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd52bed4/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 09b7ddc..ce84e69 100644
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -23,8 +23,8 @@ login=15
logout=15
### SAML SSO/SLO commands
-samlsso=15
-samlslo=15
+samlSso=15
+samlSlo=15
getSPMetadata=15
### Account commands
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd52bed4/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java
index 0f316a8..c838ece 100644
--- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java
+++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java
@@ -73,7 +73,7 @@ import java.security.PrivateKey;
import java.util.List;
import java.util.Map;
-@APICommand(name = "samlsso", description = "SP initiated SAML Single Sign On", requestHasSensitiveInfo = true, responseObject = LoginCmdResponse.class, entityType = {})
+@APICommand(name = "samlSso", description = "SP initiated SAML Single Sign On", requestHasSensitiveInfo = true, responseObject = LoginCmdResponse.class, entityType = {})
public class SAML2LoginAPIAuthenticatorCmd extends BaseCmd implements APIAuthenticator {
public static final Logger s_logger = Logger.getLogger(SAML2LoginAPIAuthenticatorCmd.class.getName());
private static final String s_name = "loginresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd52bed4/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java
index cdc24e0..7b1c367 100644
--- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java
+++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java
@@ -51,7 +51,7 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
-@APICommand(name = "samlslo", description = "SAML Global Log Out API", responseObject = LogoutCmdResponse.class, entityType = {})
+@APICommand(name = "samlSlo", description = "SAML Global Log Out API", responseObject = LogoutCmdResponse.class, entityType = {})
public class SAML2LogoutAPIAuthenticatorCmd extends BaseCmd implements APIAuthenticator {
public static final Logger s_logger = Logger.getLogger(SAML2LogoutAPIAuthenticatorCmd.class.getName());
private static final String s_name = "logoutresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd52bed4/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 71f5c5b..517c76c 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -1423,7 +1423,7 @@ public enum Config {
ManagementServer.class,
String.class,
"saml2.sp.sso.url",
- "http://localhost:8080/client/api?command=samlsso",
+ "http://localhost:8080/client/api?command=samlSso",
"SAML2 CloudStack Service Provider Single Sign On URL",
null),
SAMLServiceProviderSingleLogOutURL(
@@ -1431,7 +1431,7 @@ public enum Config {
ManagementServer.class,
String.class,
"saml2.sp.slo.url",
- "http://localhost:8080/client/api?command=samlslo",
+ "http://localhost:8080/client/api?command=samlSlo",
"SAML2 CloudStack Service Provider Single Log Out URL",
null),
SAMLIdentityProviderID(