Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 20090FC54 for ; Sat, 30 Mar 2013 16:56:39 +0000 (UTC) Received: (qmail 72160 invoked by uid 500); 30 Mar 2013 16:56:25 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 72106 invoked by uid 500); 30 Mar 2013 16:56:25 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 69796 invoked by uid 99); 30 Mar 2013 16:56:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Mar 2013 16:56:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A5ACE834819; Sat, 30 Mar 2013 16:56:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Sat, 30 Mar 2013 16:56:38 -0000 Message-Id: In-Reply-To: <607c8f4e3df2435d8a751c0f811af0a7@git.apache.org> References: <607c8f4e3df2435d8a751c0f811af0a7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/50] [abbrv] git commit: updated refs/heads/marvin-refactor to 5ce2643 CLOUDSTACK-1276, CLOUDSTACK-1729: Remove autoscanning, ensure adpater execution order in runtime Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/67276eac Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/67276eac Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/67276eac Branch: refs/heads/marvin-refactor Commit: 67276eac19d9261ab7cae379064fba23305d28b0 Parents: c749ce5 Author: Kelven Yang Authored: Thu Mar 21 20:21:11 2013 -0700 Committer: Prasanna Santhanam Committed: Sat Mar 30 22:21:54 2013 +0530 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 586 ++++++++++++++- client/tomcatconf/componentContext.xml.in | 408 ++++------- client/tomcatconf/nonossComponentContext.xml.in | 463 +++++------- server/src/com/cloud/deploy/FirstFitPlanner.java | 24 +- .../com/cloud/ha/HighAvailabilityManagerImpl.java | 20 +- .../src/com/cloud/network/NetworkManagerImpl.java | 43 +- server/src/com/cloud/network/NetworkModelImpl.java | 12 +- .../com/cloud/resource/ResourceManagerImpl.java | 24 +- .../src/com/cloud/server/ManagementServerImpl.java | 116 +++- .../src/com/cloud/storage/StorageManagerImpl.java | 26 +- server/src/com/cloud/user/AccountManagerImpl.java | 12 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 18 +- 12 files changed, 1178 insertions(+), 574 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67276eac/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 6cec8b3..da7a380 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -32,8 +32,6 @@ - - @@ -91,9 +89,6 @@ - - - @@ -165,5 +160,586 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67276eac/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index 7524dbd..927dc51 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -28,302 +28,176 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + - - + - + + - - - - + + + + + + + + + - + - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + - - - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67276eac/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index a742792..1880690 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -33,80 +33,47 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + + + + + + + + @@ -115,240 +82,224 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + + - - - - - - - - - - - - - - - - + + + - - - - - - + + - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67276eac/server/src/com/cloud/deploy/FirstFitPlanner.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java index c219cfc..0cbf72f 100755 --- a/server/src/com/cloud/deploy/FirstFitPlanner.java +++ b/server/src/com/cloud/deploy/FirstFitPlanner.java @@ -103,12 +103,24 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { @Inject DataStoreManager dataStoreMgr; @Inject protected ClusterDetailsDao _clusterDetailsDao; - //@com.cloud.utils.component.Inject(adapter=StoragePoolAllocator.class) - @Inject protected List _storagePoolAllocators; - - //@com.cloud.utils.component.Inject(adapter=HostAllocator.class) - @Inject protected List _hostAllocators; - protected String _allocationAlgorithm = "random"; + protected List _storagePoolAllocators; + public List getStoragePoolAllocators() { + return _storagePoolAllocators; + } + public void setStoragePoolAllocators( + List _storagePoolAllocators) { + this._storagePoolAllocators = _storagePoolAllocators; + } + + protected List _hostAllocators; + public List getHostAllocators() { + return _hostAllocators; + } + public void setHostAllocators(List _hostAllocators) { + this._hostAllocators = _hostAllocators; + } + + protected String _allocationAlgorithm = "random"; @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67276eac/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java index bba8be5..25c5a04 100755 --- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -116,11 +116,23 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai ClusterDetailsDao _clusterDetailsDao; long _serverId; - @Inject List _investigators; - @Inject - List _fenceBuilders; - @Inject + public List getInvestigators() { + return _investigators; + } + public void setInvestigators(List _investigators) { + this._investigators = _investigators; + } + + List _fenceBuilders; + public List getFenceBuilders() { + return _fenceBuilders; + } + public void setFenceBuilders(List _fenceBuilders) { + this._fenceBuilders = _fenceBuilders; + } + + @Inject AgentManager _agentMgr; @Inject AlertManager _alertMgr; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67276eac/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 226bf05..d77aa1f 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -243,16 +243,41 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L @Inject PodVlanMapDao _podVlanMapDao; - @Inject List _networkGurus; - - @Inject protected List _networkElements; - - @Inject NetworkDomainDao _networkDomainDao; - @Inject List _ipDeployers; - @Inject List _dhcpProviders; - - @Inject + public List getNetworkGurus() { + return _networkGurus; + } + public void setNetworkGurus(List _networkGurus) { + this._networkGurus = _networkGurus; + } + + List _networkElements; + public List getNetworkElements() { + return _networkElements; + } + public void setNetworkElements(List _networkElements) { + this._networkElements = _networkElements; + } + + @Inject NetworkDomainDao _networkDomainDao; + + List _ipDeployers; + public List getIpDeployers() { + return _ipDeployers; + } + public void setIpDeployers(List _ipDeployers) { + this._ipDeployers = _ipDeployers; + } + + List _dhcpProviders; + public List getDhcpProviders() { + return _dhcpProviders; + } + public void setDhcpProviders(List _dhcpProviders) { + this._dhcpProviders = _dhcpProviders; + } + + @Inject VMInstanceDao _vmDao; @Inject FirewallManager _firewallMgr; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67276eac/server/src/com/cloud/network/NetworkModelImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java index d1326b5..e6361b0 100644 --- a/server/src/com/cloud/network/NetworkModelImpl.java +++ b/server/src/com/cloud/network/NetworkModelImpl.java @@ -143,9 +143,15 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { @Inject PodVlanMapDao _podVlanMapDao; - @Inject List _networkElements; - - @Inject + List _networkElements; + public List getNetworkElements() { + return _networkElements; + } + public void setNetworkElements(List _networkElements) { + this._networkElements = _networkElements; + } + + @Inject NetworkDomainDao _networkDomainDao; @Inject VMInstanceDao _vmDao;