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/08/24 16:05:06 UTC
[46/50] [abbrv] git commit: updated refs/heads/saml2 to ba68616
core: Add registry and beans in spring registry for PluggableAPIAuthenticator
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/31616e63
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/31616e63
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/31616e63
Branch: refs/heads/saml2
Commit: 31616e6352914138f3de160d1f6822e146c019f9
Parents: f7c5b2a
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Sun Aug 24 15:54:55 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Sun Aug 24 15:55:35 2014 +0200
----------------------------------------------------------------------
.../api/spring-core-lifecycle-api-context-inheritable.xml | 6 ++++++
.../cloudstack/core/spring-core-registry-core-context.xml | 9 ++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/31616e63/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml b/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
index d4dcc80..f1566b1 100644
--- a/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
@@ -36,6 +36,12 @@
</bean>
<bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
+ <property name="registry" ref="pluggableAPIAuthenticatorsRegistry" />
+ <property name="typeClass"
+ value=" org.apache.cloudstack.api.auth.PluggableAPIAuthenticator" />
+ </bean>
+
+ <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
<property name="registry" ref="securityCheckersRegistry" />
<property name="typeClass"
value="org.apache.cloudstack.acl.SecurityChecker" />
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/31616e63/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index 02034d6..3263e92 100644
--- a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++ b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -33,7 +33,14 @@
class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
<property name="orderConfigKey" value="user.authenticators.order" />
<property name="excludeKey" value="user.authenticators.exclude" />
- <property name="orderConfigDefault" value="SHA256SALT,MD5,LDAP,PLAINTEXT" />
+ <property name="orderConfigDefault" value="SHA256SALT,MD5,LDAP,SAML2,PLAINTEXT" />
+ </bean>
+
+ <bean id="pluggableAPIAuthenticatorsRegistry"
+ class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
+ <property name="orderConfigKey" value="pluggableApi.authenticators.order" />
+ <property name="excludeKey" value="pluggableApi.authenticators.exclude" />
+ <property name="orderConfigDefault" value="SAML2Auth" />
</bean>
<bean id="userPasswordEncodersRegistry"