core: Add registry and beans in spring registry for PluggableAPIAuthenticator

yadvr · yadvr · commit 47c90508712e · 2014-08-28T19:45:22.000+02:00
Signed-off-by: Rohit Yadav &lt;rohit.yadav@shapeblue.com&gt;
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
@@ -35,6 +35,12 @@
             value="com.cloud.server.auth.UserAuthenticator" />
     </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"
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
@@ -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"
