You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/03/21 02:04:22 UTC
[08/25] git commit: refs/heads/api_entity - CLOUDSTACK-1729: a
partical resolution for user authenticators to unblock developers who are
currently working on, for non-oss version
CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on, for non-oss version
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4faad73d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4faad73d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4faad73d
Branch: refs/heads/api_entity
Commit: 4faad73d6c0f47a31c5ec8ff9270a61120d04eb2
Parents: 6bc12fa
Author: Kelven Yang <ke...@gmail.com>
Authored: Tue Mar 19 18:54:16 2013 -0700
Committer: Kelven Yang <ke...@gmail.com>
Committed: Tue Mar 19 18:54:16 2013 -0700
----------------------------------------------------------------------
client/tomcatconf/nonossComponentContext.xml.in | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4faad73d/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index 7e3552d..8f8dae5 100644
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@ -37,8 +37,24 @@
-->
<bean id="premiumDatabaseUpgradeChecker" class="com.cloud.upgrade.PremiumDatabaseUpgradeChecker"/>
- <bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl" />
<bean id="configurationServerImpl" class="com.cloud.server.ConfigurationServerImpl" />
+ <bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl" >
+ <property name="UserAuthenticators">
+ <list>
+ <ref bean="MD5UserAuthenticator"/>
+ <ref bean="LDAPUserAuthenticator"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean id ="AccountManagerImpl" class="com.cloud.user.AccountManagerImpl">
+ <property name="UserAuthenticators">
+ <list>
+ <ref bean="MD5UserAuthenticator"/>
+ <ref bean="LDAPUserAuthenticator"/>
+ </list>
+ </property>
+ </bean>
<bean id="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" />
<bean id="clusteredAgentManagerImpl" class="com.cloud.agent.manager.ClusteredAgentManagerImpl" />