core: Add registry and beans in spring registry for PluggableAPIAuthenticator
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/47c90508 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/47c90508 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/47c90508 Branch: refs/heads/master Commit: 47c90508712e7bc6a9dfed7c53ebc0b0ccd27696 Parents: 7ff5049 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Sun Aug 24 15:54:55 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Aug 28 19:45:22 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/47c90508/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/47c90508/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"
