Return-Path: 
 <cloudstack-commits-return-14214-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3AFE8FE89
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Wed, 20 Mar 2013 01:55:02 +0000 (UTC)
Received: (qmail 76927 invoked by uid 500); 20 Mar 2013 01:55:02 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 76904 invoked by uid 500); 20 Mar 2013 01:55:02 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 76896 invoked by uid 99); 20 Mar 2013 01:55:02 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Mar 2013 01:55:02 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id D32943D4D0; Wed, 20 Mar 2013 01:55:01 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: kelveny@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: refs/heads/master - CLOUDSTACK-1729: a partical
 resolution for user authenticators to unblock developers who are currently
 working on, for non-oss version
Message-Id: <20130320015501.D32943D4D0@tyr.zones.apache.org>
Date: Wed, 20 Mar 2013 01:55:01 +0000 (UTC)

Updated Branches:
  refs/heads/master 6bc12fa66 -> 4faad73d6


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/master
Commit: 4faad73d6c0f47a31c5ec8ff9270a61120d04eb2
Parents: 6bc12fa
Author: Kelven Yang <kelveny@gmail.com>
Authored: Tue Mar 19 18:54:16 2013 -0700
Committer: Kelven Yang <kelveny@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" />