Merge branch 'master' into ui-restyle
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fbb0499b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fbb0499b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fbb0499b Branch: refs/heads/ui-restyle Commit: fbb0499be38ee902346ba4c1bf074f1698bf28d4 Parents: 8351bd7 59ad4a9 Author: Brian Federle <[email protected]> Authored: Thu Oct 3 12:38:56 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Thu Oct 3 12:38:56 2013 -0700 ---------------------------------------------------------------------- agent/src/com/cloud/agent/Agent.java | 10 +- .../consoleproxy/ConsoleProxyResource.java | 6 +- .../apache/cloudstack/context/CallContext.java | 29 +- .../cloudstack/context/CallContextListener.java | 53 ++++ .../service/controller/s3/ServiceProvider.java | 6 +- client/tomcatconf/applicationContext.xml.in | 16 ++ .../template/HttpTemplateDownloader.java | 6 +- .../storage/template/S3TemplateDownloader.java | 5 +- .../template/TemplateDownloaderBase.java | 5 +- .../cloudstack/context/ServerContexts.java | 67 ----- .../com/cloud/agent/manager/AgentAttache.java | 5 +- .../cloud/agent/manager/AgentManagerImpl.java | 46 ++-- .../manager/ClusteredAgentManagerImpl.java | 19 +- .../cloud/agent/manager/DirectAgentAttache.java | 9 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 9 +- .../orchestration/NetworkOrchestrator.java | 9 +- .../com/cloud/upgrade/dao/Upgrade2214to30.java | 2 +- .../src/com/cloud/vm/dao/NicDetailDaoImpl.java | 5 - .../src/com/cloud/vm/dao/UserVmDetailsDao.java | 8 +- .../com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 24 ++ .../cache/manager/StorageCacheManagerImpl.java | 7 +- .../StorageCacheReplacementAlgorithmLRU.java | 8 +- .../cloudstack/storage/LocalHostEndpoint.java | 13 +- .../cloudstack/storage/RemoteHostEndPoint.java | 5 +- .../com/cloud/cluster/ClusterManagerImpl.java | 21 +- .../cluster/ClusterServiceServletContainer.java | 6 +- .../com/cloud/utils/db/ConnectionConcierge.java | 6 +- .../client/ClientTransportProvider.java | 8 +- .../server/ServerTransportProvider.java | 10 +- .../jobs/AsyncJobExecutionContext.java | 4 +- .../jobs/impl/AsyncJobManagerImpl.java | 14 +- .../framework/jobs/impl/AsyncJobMonitor.java | 7 +- framework/managed-context/pom.xml | 36 +++ .../context/AbstractManagedContextListener.java | 32 +++ .../managed/context/ManagedContext.java | 33 +++ .../managed/context/ManagedContextListener.java | 36 +++ .../managed/context/ManagedContextRunnable.java | 86 ++++++ .../context/ManagedContextTimerTask.java | 37 +++ .../managed/context/ManagedContextUtils.java | 55 ++++ .../context/impl/DefaultManagedContext.java | 155 +++++++++++ .../managed/threadlocal/ManagedThreadLocal.java | 82 ++++++ .../context/impl/DefaultManagedContextTest.java | 269 +++++++++++++++++++ framework/pom.xml | 1 + .../mom/rabbitmq/RabbitMQEventBus.java | 8 +- .../hypervisor/kvm/resource/KVMHAMonitor.java | 7 +- .../com/cloud/ucs/manager/UcsManagerImpl.java | 6 +- .../vmware/resource/VmwareResource.java | 3 +- .../lb/ElasticLoadBalancerManagerImpl.java | 6 +- pom.xml | 11 + .../src/com/cloud/alert/AlertManagerImpl.java | 5 +- .../com/cloud/api/ApiAsyncJobDispatcher.java | 16 +- server/src/com/cloud/api/ApiServer.java | 10 +- server/src/com/cloud/api/ApiServlet.java | 16 +- .../com/cloud/api/query/QueryManagerImpl.java | 29 +- .../deploy/DeploymentPlanningManagerImpl.java | 6 +- .../ha/HighAvailabilityManagerExtImpl.java | 6 +- .../cloud/ha/HighAvailabilityManagerImpl.java | 137 +++++----- .../metadata/ResourceMetaDataManagerImpl.java | 32 ++- .../network/ExternalDeviceUsageManagerImpl.java | 6 +- .../network/lb/LBHealthCheckManagerImpl.java | 6 +- .../VirtualNetworkApplianceManagerImpl.java | 102 ++++--- .../security/SecurityGroupManagerImpl.java | 10 +- .../security/SecurityGroupManagerImpl2.java | 12 +- .../com/cloud/network/vpc/VpcManagerImpl.java | 8 +- .../com/cloud/projects/ProjectManagerImpl.java | 7 +- .../resourcelimit/ResourceLimitManagerImpl.java | 6 +- .../com/cloud/server/ManagementServerImpl.java | 9 +- server/src/com/cloud/server/StatsCollector.java | 21 +- .../com/cloud/storage/StorageManagerImpl.java | 6 +- .../storage/download/DownloadListener.java | 10 +- .../storage/snapshot/SnapshotSchedulerImpl.java | 9 +- .../cloud/storage/upload/UploadListener.java | 10 +- .../cloud/storage/upload/UploadMonitorImpl.java | 6 +- .../com/cloud/template/TemplateManagerImpl.java | 5 +- .../src/com/cloud/user/AccountManagerImpl.java | 15 +- .../src/com/cloud/vm/SystemVmLoadScanner.java | 10 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 8 +- .../metadata/ResourceMetaDataManagerTest.java | 2 +- test/integration/component/test_portable_ip.py | 245 ++++++++++++++++- usage/src/com/cloud/usage/UsageManagerImpl.java | 24 +- .../src/com/cloud/usage/parser/UsageParser.java | 5 +- utils/pom.xml | 15 +- .../hypervisor/vmware/mo/VirtualMachineMO.java | 15 +- .../vmware/util/VmwareContextPool.java | 8 +- .../hypervisor/vmware/util/VmwareHelper.java | 44 ++- 85 files changed, 1714 insertions(+), 478 deletions(-) ----------------------------------------------------------------------
