You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/04/09 15:20:47 UTC
[10/50] [abbrv] git commit: updated refs/heads/marvin_refactor to
2a99064
CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on and relying on the fix
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/37e9c91d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/37e9c91d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/37e9c91d
Branch: refs/heads/marvin_refactor
Commit: 37e9c91d87896185b774ad51a5b201ad5e0bf214
Parents: 7d4fd16
Author: Kelven Yang <ke...@gmail.com>
Authored: Tue Mar 19 15:47:08 2013 -0700
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sun Mar 31 22:01:40 2013 +0530
----------------------------------------------------------------------
client/tomcatconf/componentContext.xml.in | 20 +++++++++++++-
.../src/com/cloud/server/ManagementServerImpl.java | 8 ++++++
server/src/com/cloud/user/AccountManagerImpl.java | 20 +++-----------
3 files changed, 31 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37e9c91d/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 9b819c3..dad5d4d 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -36,9 +36,25 @@
-->
<bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" />
<bean id="encryptionSecretKeyChecker" class="com.cloud.utils.crypt.EncryptionSecretKeyChecker" />
-
- <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" />
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37e9c91d/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index d0904e1..baa09bc 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -482,6 +482,14 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
this._hostAllocators = _hostAllocators;
}
+ public List<UserAuthenticator> getUserAuthenticators() {
+ return _userAuthenticators;
+ }
+
+ public void setUserAuthenticators(List<UserAuthenticator> authenticators) {
+ _userAuthenticators = authenticators;
+ }
+
@Override
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37e9c91d/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 40db4ed..93bb725 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -230,26 +230,18 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
UserVO _systemUser;
AccountVO _systemAccount;
+ @Inject
List<SecurityChecker> _securityCheckers;
-
- int _cleanupInterval;
+ int _cleanupInterval;
public List<UserAuthenticator> getUserAuthenticators() {
- return _userAuthenticators;
+ return _userAuthenticators;
}
-
+
public void setUserAuthenticators(List<UserAuthenticator> authenticators) {
- _userAuthenticators = authenticators;
+ _userAuthenticators = authenticators;
}
-
- public List<SecurityChecker> getSecurityCheckers() {
- return _securityCheckers;
- }
- public void setSecurityCheckers(List<SecurityChecker> securityCheckers) {
- this._securityCheckers = securityCheckers;
- }
-
@Override
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
_systemAccount = _accountDao.findById(AccountVO.ACCOUNT_ID_SYSTEM);
@@ -1180,7 +1172,6 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
}
@Override
- @ActionEvent(eventType = EventTypes.EVENT_ACCOUNT_ENABLE, eventDescription = "enabling account", async = true)
public AccountVO enableAccount(String accountName, Long domainId, Long accountId) {
// Check if account exists
@@ -1271,7 +1262,6 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
@Override
@DB
- @ActionEvent(eventType = EventTypes.EVENT_ACCOUNT_UPDATE, eventDescription = "updating account", async = true)
public AccountVO updateAccount(UpdateAccountCmd cmd) {
Long accountId = cmd.getId();
Long domainId = cmd.getDomainId();