You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/01/09 14:26:48 UTC
[23/50] [abbrv] git commit: Merge branch 'javelin' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7f3a748d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7f3a748d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7f3a748d
Branch: refs/heads/javelin
Commit: 7f3a748d6cef29fd2e64b00ce56238e6a191d737
Parents: e54ed85 32e67f6
Author: Alex Huang <al...@citrix.com>
Authored: Tue Jan 8 14:46:38 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Tue Jan 8 14:46:38 2013 -0800
----------------------------------------------------------------------
.../ImageDataStoreProviderManagerImpl.java | 4 +-
.../PrimaryDataStoreProviderManagerImpl.java | 4 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 3 +-
.../src/com/cloud/agent/manager/AgentMonitor.java | 20 ++--
.../src/com/cloud/server/ManagementServerImpl.java | 97 +++++++++++++--
.../cloud/utils/component/ComponentContext.java | 29 ++++-
6 files changed, 131 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f3a748d/server/src/com/cloud/agent/manager/AgentManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 1ffab59,970cae5..40bc1d1
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@@ -218,10 -218,9 +218,10 @@@ public class AgentManagerImpl implement
protected int _pingInterval;
protected long _pingTimeout;
- @Inject protected AgentMonitor _monitor = null;
+ @Inject protected AgentMonitor _monitor;
protected ExecutorService _executor;
+ protected ThreadPoolExecutor _connectExecutor;
protected StateMachine2<Status, Status.Event, Host> _statusStateMachine = Status.getStateMachine();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f3a748d/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/server/ManagementServerImpl.java
index 871d0d3,374d1ab..5881cf1
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@@ -43,34 -43,17 +43,39 @@@ import javax.annotation.PostConstruct
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import javax.inject.Inject;
+ import javax.management.InstanceAlreadyExistsException;
+ import javax.management.MBeanRegistrationException;
+ import javax.management.MalformedObjectNameException;
+ import javax.management.NotCompliantMBeanException;
+import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd;
+import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd;
+import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
+import org.apache.cloudstack.api.command.admin.resource.ListAlertsCmd;
+import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd;
+import org.apache.cloudstack.api.command.admin.systemvm.DestroySystemVmCmd;
+import org.apache.cloudstack.api.command.admin.systemvm.UpgradeSystemVMCmd;
+import org.apache.cloudstack.api.command.user.address.ListPublicIpAddressesCmd;
+import org.apache.cloudstack.api.command.user.config.ListCapabilitiesCmd;
+import org.apache.cloudstack.api.command.user.guest.ListGuestOsCategoriesCmd;
+import org.apache.cloudstack.api.command.user.guest.ListGuestOsCmd;
+import org.apache.cloudstack.api.command.user.iso.ListIsosCmd;
+import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd;
+import org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd;
+import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
+import org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd;
+import org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd;
+import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;
+import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd;
+import org.apache.cloudstack.api.command.user.template.UpdateTemplateCmd;
+import org.apache.cloudstack.api.command.user.vm.GetVMPasswordCmd;
+import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
+ import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
-import com.cloud.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.GetVncPortAnswer;
import com.cloud.agent.api.GetVncPortCommand;