You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/10/24 20:31:00 UTC
[22/50] [abbrv] git commit: updated refs/heads/ui-restyle to 500c798
Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'
Conflicts:
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/81d01369
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/81d01369
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/81d01369
Branch: refs/heads/ui-restyle
Commit: 81d01369d76ecf5e64d1786777d84e599f42cfa1
Parents: 0ed7ebd df728fc
Author: Darren Shepherd <da...@gmail.com>
Authored: Wed Oct 23 12:31:53 2013 -0700
Committer: Darren Shepherd <da...@gmail.com>
Committed: Wed Oct 23 12:31:53 2013 -0700
----------------------------------------------------------------------
.../cloudstack/api-planner/module.properties | 2 +
.../api-planner/spring-api-planner-context.xml | 34 +
.../exception/ConcurrentOperationException.java | 3 +-
.../apache/cloudstack/context/CallContext.java | 2 +-
.../bridge/persist/dao/BucketPolicyDaoImpl.java | 6 +-
.../persist/dao/CloudStackAccountDaoImpl.java | 3 +-
.../dao/CloudStackConfigurationDaoImpl.java | 3 +-
.../dao/CloudStackSvcOfferingDaoImpl.java | 5 +-
.../persist/dao/CloudStackUserDaoImpl.java | 3 +-
.../cloud/bridge/persist/dao/MHostDaoImpl.java | 5 +-
.../bridge/persist/dao/MHostMountDaoImpl.java | 3 +-
.../persist/dao/MultiPartPartsDaoImpl.java | 9 +-
.../persist/dao/MultiPartUploadsDaoImpl.java | 15 +-
.../bridge/persist/dao/MultipartLoadDao.java | 9 +-
.../persist/dao/MultipartMetaDaoImpl.java | 3 +-
.../bridge/persist/dao/OfferingDaoImpl.java | 11 +-
.../cloud/bridge/persist/dao/SAclDaoImpl.java | 7 +-
.../bridge/persist/dao/SBucketDaoImpl.java | 5 +-
.../cloud/bridge/persist/dao/SHostDaoImpl.java | 5 +-
.../cloud/bridge/persist/dao/SMetaDaoImpl.java | 5 +-
.../bridge/persist/dao/SObjectDaoImpl.java | 7 +-
.../bridge/persist/dao/SObjectItemDaoImpl.java | 5 +-
.../persist/dao/UserCredentialsDaoImpl.java | 5 +-
.../cloud/bridge/service/EC2RestServlet.java | 13 +-
.../com/cloud/bridge/service/S3RestServlet.java | 5 +-
.../service/controller/s3/S3BucketAction.java | 3 +-
.../service/controller/s3/ServiceProvider.java | 7 +-
.../cloud/bridge/service/core/s3/S3Engine.java | 23 +-
client/WEB-INF/web.xml | 6 +-
client/pom.xml | 56 +-
.../cloudstack/webApplicationContext.xml | 32 +
client/tomcatconf/applicationContext.xml.in | 956 --------------
client/tomcatconf/componentContext.xml.in | 324 -----
client/tomcatconf/log4j-cloud.xml.in | 8 +
client/tomcatconf/nonossComponentContext.xml.in | 422 -------
.../tomcatconf/simulatorComponentContext.xml.in | 284 -----
.../cloudstack/allocator/module.properties | 2 +
.../allocator/spring-core-allocator-context.xml | 32 +
...-lifecycle-allocator-context-inheritable.xml | 42 +
.../META-INF/cloudstack/api/module.properties | 2 +
...g-core-lifecycle-api-context-inheritable.xml | 53 +
.../cloudstack/backend/module.properties | 2 +
.../cloudstack/bootstrap/module.properties | 1 +
.../spring-bootstrap-context-inheritable.xml | 39 +
.../bootstrap/spring-bootstrap-context.xml | 32 +
.../cloudstack/compute/module.properties | 2 +
...re-lifecycle-compute-context-inheritable.xml | 45 +
.../META-INF/cloudstack/core/module.properties | 2 +
.../cloudstack/core/spring-core-context.xml | 36 +
...-core-lifecycle-core-context-inheritable.xml | 41 +
.../core/spring-core-registry-core-context.xml | 197 +++
.../cloudstack/discoverer/module.properties | 2 +
...lifecycle-discoverer-context-inheritable.xml | 35 +
.../cloudstack/network/module.properties | 2 +
...re-lifecycle-network-context-inheritable.xml | 58 +
.../cloudstack/planner/module.properties | 2 +
...re-lifecycle-planner-context-inheritable.xml | 41 +
.../cloudstack/storage/module.properties | 2 +
...ng-lifecycle-storage-context-inheritable.xml | 74 ++
.../cloudstack/system/module.properties | 2 +
.../spring-core-system-context-inheritable.xml | 54 +
.../system/spring-core-system-context.xml | 50 +
.../core/spring-engine-api-core-context.xml | 44 +
...pring-engine-components-api-core-context.xml | 30 +
...spring-engine-orchestration-core-context.xml | 71 ++
.../cloud/agent/manager/AgentManagerImpl.java | 5 +-
.../manager/ClusteredAgentManagerImpl.java | 4 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 124 +-
.../entity/api/db/dao/DcDetailsDaoImpl.java | 4 +-
.../entity/api/db/dao/EngineClusterDaoImpl.java | 6 +-
.../api/db/dao/EngineDataCenterDaoImpl.java | 6 +-
.../entity/api/db/dao/EngineHostDaoImpl.java | 14 +-
.../entity/api/db/dao/EngineHostPodDaoImpl.java | 6 +-
.../entity/api/db/dao/HostDetailsDaoImpl.java | 4 +-
.../entity/api/db/dao/HostTagsDaoImpl.java | 4 +-
.../orchestration/NetworkOrchestrator.java | 896 ++++++-------
.../orchestration/VolumeOrchestrator.java | 88 +-
.../spring-engine-schema-core-daos-context.xml | 322 +++++
...ng-engine-schema-system-checkers-context.xml | 34 +
.../src/com/cloud/alert/dao/AlertDaoImpl.java | 4 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 26 +-
.../configuration/dao/ResourceCountDaoImpl.java | 4 +-
.../src/com/cloud/dc/ClusterDetailsDaoImpl.java | 6 +-
.../src/com/cloud/dc/dao/ClusterDaoImpl.java | 6 +-
.../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java | 4 +-
.../src/com/cloud/dc/dao/DataCenterDaoImpl.java | 6 +-
.../dc/dao/DataCenterIpAddressDaoImpl.java | 8 +-
.../DataCenterLinkLocalIpAddressDaoImpl.java | 6 +-
.../src/com/cloud/dc/dao/DataCenterVnetDao.java | 3 +-
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 8 +-
.../src/com/cloud/dc/dao/DcDetailsDaoImpl.java | 4 +-
.../src/com/cloud/dc/dao/HostPodDaoImpl.java | 6 +-
.../src/com/cloud/dc/dao/PodVlanDaoImpl.java | 8 +-
.../dc/dao/StorageNetworkIpAddressDaoImpl.java | 6 +-
.../src/com/cloud/dc/dao/VlanDaoImpl.java | 4 +-
.../src/com/cloud/domain/dao/DomainDaoImpl.java | 6 +-
.../src/com/cloud/event/dao/EventDaoImpl.java | 4 +-
.../com/cloud/event/dao/UsageEventDaoImpl.java | 10 +-
.../src/com/cloud/host/dao/HostDaoImpl.java | 14 +-
.../com/cloud/host/dao/HostDetailsDaoImpl.java | 4 +-
.../src/com/cloud/host/dao/HostTagsDaoImpl.java | 4 +-
.../src/com/cloud/keystore/KeystoreDaoImpl.java | 4 +-
.../network/dao/FirewallRulesCidrsDaoImpl.java | 4 +-
.../cloud/network/dao/FirewallRulesDaoImpl.java | 6 +-
.../com/cloud/network/dao/IPAddressDaoImpl.java | 6 +-
.../com/cloud/network/dao/NetworkDaoImpl.java | 10 +-
.../cloud/network/dao/PortProfileDaoImpl.java | 4 +-
.../security/dao/SecurityGroupDaoImpl.java | 6 +-
.../security/dao/SecurityGroupWorkDaoImpl.java | 8 +-
.../security/dao/VmRulesetLogDaoImpl.java | 8 +-
.../cloud/network/vpc/dao/PrivateIpDaoImpl.java | 4 +-
.../network/vpc/dao/StaticRouteDaoImpl.java | 4 +-
.../com/cloud/network/vpc/dao/VpcDaoImpl.java | 8 +-
.../network/vpc/dao/VpcOfferingDaoImpl.java | 4 +-
.../offerings/dao/NetworkOfferingDaoImpl.java | 6 +-
.../com/cloud/projects/dao/ProjectDaoImpl.java | 4 +-
.../dao/ServiceOfferingDetailsDaoImpl.java | 4 +-
.../storage/dao/LaunchPermissionDaoImpl.java | 6 +-
.../com/cloud/storage/dao/SnapshotDaoImpl.java | 14 +-
.../storage/dao/StoragePoolDetailsDaoImpl.java | 4 +-
.../storage/dao/StoragePoolHostDaoImpl.java | 10 +-
.../storage/dao/StoragePoolWorkDaoImpl.java | 4 +-
.../cloud/storage/dao/VMTemplateDaoImpl.java | 14 +-
.../storage/dao/VMTemplateDetailsDaoImpl.java | 4 +-
.../storage/dao/VMTemplateHostDaoImpl.java | 8 +-
.../storage/dao/VMTemplatePoolDaoImpl.java | 8 +-
.../storage/dao/VMTemplateZoneDaoImpl.java | 4 +-
.../com/cloud/storage/dao/VolumeDaoImpl.java | 12 +-
.../cloud/storage/dao/VolumeDetailsDaoImpl.java | 4 +-
.../src/com/cloud/upgrade/DatabaseCreator.java | 8 +-
.../cloud/upgrade/DatabaseIntegrityChecker.java | 7 +-
.../cloud/upgrade/DatabaseUpgradeChecker.java | 9 +-
.../com/cloud/upgrade/dao/Upgrade307to410.java | 1 -
.../com/cloud/upgrade/dao/VersionDaoImpl.java | 4 +-
.../src/com/cloud/usage/dao/UsageDaoImpl.java | 26 +-
.../cloud/usage/dao/UsageIPAddressDaoImpl.java | 6 +-
.../com/cloud/usage/dao/UsageJobDaoImpl.java | 8 +-
.../dao/UsageLoadBalancerPolicyDaoImpl.java | 8 +-
.../cloud/usage/dao/UsageNetworkDaoImpl.java | 8 +-
.../usage/dao/UsageNetworkOfferingDaoImpl.java | 6 +-
.../dao/UsagePortForwardingRuleDaoImpl.java | 8 +-
.../usage/dao/UsageSecurityGroupDaoImpl.java | 6 +-
.../cloud/usage/dao/UsageStorageDaoImpl.java | 8 +-
.../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 8 +-
.../cloud/usage/dao/UsageVMSnapshotDaoImpl.java | 8 +-
.../cloud/usage/dao/UsageVPNUserDaoImpl.java | 6 +-
.../com/cloud/usage/dao/UsageVmDiskDaoImpl.java | 8 +-
.../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 8 +-
.../com/cloud/user/AccountDetailsDaoImpl.java | 4 +-
.../src/com/cloud/user/dao/AccountDaoImpl.java | 4 +-
.../cloud/user/dao/UserStatisticsDaoImpl.java | 6 +-
.../cloud/user/dao/VmDiskStatisticsDaoImpl.java | 6 +-
.../com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 16 +-
.../com/cloud/vm/dao/DomainRouterDaoImpl.java | 8 +-
.../src/com/cloud/vm/dao/NicDetailDaoImpl.java | 4 +-
.../cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 8 +-
.../src/com/cloud/vm/dao/UserVmDaoImpl.java | 8 +-
.../com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 4 +-
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 12 +-
.../affinity/dao/AffinityGroupVMMapDaoImpl.java | 4 +-
.../entity/api/db/dao/VMComputeTagDaoImpl.java | 4 +-
.../entity/api/db/dao/VMEntityDaoImpl.java | 4 +-
.../entity/api/db/dao/VMNetworkMapDaoImpl.java | 4 +-
.../entity/api/db/dao/VMReservationDaoImpl.java | 4 +-
.../entity/api/db/dao/VMRootDiskTagDaoImpl.java | 4 +-
.../datastore/db/PrimaryDataStoreDaoImpl.java | 10 +-
...spring-engine-storage-cache-core-context.xml | 38 +
...g-engine-storage-datamotion-core-context.xml | 35 +
...ngine-storage-datamotion-storage-context.xml | 34 +
.../storage/motion/DataMotionServiceImpl.java | 7 +-
...spring-engine-storage-image-core-context.xml | 45 +
.../core/spring-engine-storage-core-context.xml | 63 +
.../storage-allocator/module.properties | 2 +
...engine-storage-storage-allocator-context.xml | 49 +
...ing-engine-storage-snapshot-core-context.xml | 41 +
...-engine-storage-snapshot-storage-context.xml | 33 +
.../provider/DataStoreProviderManagerImpl.java | 112 +-
.../endpoint/DefaultEndPointSelector.java | 3 +-
.../image/db/ImageStoreDetailsDaoImpl.java | 4 +-
.../image/db/SnapshotDataStoreDaoImpl.java | 6 +-
.../image/db/TemplateDataStoreDaoImpl.java | 6 +-
.../image/db/VolumeDataStoreDaoImpl.java | 4 +-
.../datastore/PrimaryDataStoreHelper.java | 4 +-
.../db/PrimaryDataStoreDetailsDaoImpl.java | 4 +-
...pring-engine-storage-volume-core-context.xml | 49 +
.../spring-framework-cluster-core-context.xml | 36 +
.../com/cloud/cluster/ClusterManagerImpl.java | 102 +-
.../dao/ManagementServerHostDaoImpl.java | 16 +-
.../dao/ManagementServerHostPeerDaoImpl.java | 4 +-
...mework-config-system-context-inheritable.xml | 38 +
.../spring-framework-config-system-context.xml | 51 +
.../framework/config/ConfigDepotAdmin.java | 2 +
.../config/dao/ConfigurationDaoImpl.java | 15 +-
.../framework/config/impl/ConfigDepotImpl.java | 98 +-
.../config/impl/ConfigDepotAdminTest.java | 1 +
.../spring-framework-db-system-context.xml | 32 +
.../utils/crypt/EncryptionSecretKeyChanger.java | 3 +-
.../com/cloud/utils/db/ConnectionConcierge.java | 2 +-
framework/db/src/com/cloud/utils/db/DbUtil.java | 2 +-
.../src/com/cloud/utils/db/GenericDaoBase.java | 36 +-
.../db/src/com/cloud/utils/db/Merovingian2.java | 2 +-
.../src/com/cloud/utils/db/SequenceFetcher.java | 2 +-
.../db/src/com/cloud/utils/db/Transaction.java | 1165 +----------------
.../com/cloud/utils/db/TransactionCallback.java | 7 +
.../utils/db/TransactionCallbackNoReturn.java | 13 +
.../db/TransactionCallbackWithException.java | 7 +
...ransactionCallbackWithExceptionNoReturn.java | 32 +
.../utils/db/TransactionContextBuilder.java | 6 +-
.../utils/db/TransactionContextInterceptor.java | 39 +
.../utils/db/TransactionContextListener.java | 41 +
.../com/cloud/utils/db/TransactionLegacy.java | 1194 ++++++++++++++++++
.../cloud/utils/db/TransactionMBeanImpl.java | 18 +-
.../com/cloud/utils/db/TransactionStatus.java | 7 +
.../db/test/com/cloud/utils/db/DbTestDao.java | 4 +-
.../db/test/com/cloud/utils/db/DbTestUtils.java | 4 +-
.../com/cloud/utils/db/TestTransaction.java | 154 +++
.../com/cloud/utils/db/TransactionTest.java | 26 +-
framework/db/test/db.properties | 18 +
.../core/spring-framework-ipc-core-context.xml | 59 +
.../core/spring-framework-jobs-core-context.xml | 48 +
.../framework/jobs/dao/AsyncJobDaoImpl.java | 4 +-
.../jobs/dao/AsyncJobJoinMapDaoImpl.java | 10 +-
.../framework/jobs/dao/SyncQueueDaoImpl.java | 4 +-
.../jobs/dao/SyncQueueItemDaoImpl.java | 4 +-
.../jobs/impl/AsyncJobManagerImpl.java | 286 ++---
.../jobs/impl/SyncQueueManagerImpl.java | 271 ++--
framework/pom.xml | 2 +
framework/spring/lifecycle/pom.xml | 34 +
.../spring/lifecycle/AbstractBeanCollector.java | 113 ++
.../lifecycle/AbstractSmartLifeCycle.java | 53 +
.../lifecycle/CloudStackExtendedLifeCycle.java | 169 +++
.../CloudStackExtendedLifeCycleStart.java | 49 +
.../spring/lifecycle/CloudStackLog4jSetup.java | 56 +
.../spring/lifecycle/ConfigDepotLifeCycle.java | 47 +
.../spring/lifecycle/registry/DumpRegistry.java | 77 ++
.../lifecycle/registry/ExtensionRegistry.java | 245 ++++
.../registry/PluggableServiceLifecycle.java | 53 +
.../lifecycle/registry/RegistryLifecycle.java | 144 +++
framework/spring/module/pom.xml | 50 +
.../context/ResourceApplicationContext.java | 55 +
.../module/factory/CloudStackSpringContext.java | 137 ++
.../factory/ModuleBasedContextFactory.java | 84 ++
.../module/locator/ModuleDefinitionLocator.java | 36 +
.../impl/ClasspathModuleDefinitionLocator.java | 62 +
.../spring/module/model/ModuleDefinition.java | 48 +
.../module/model/ModuleDefinitionSet.java | 32 +
.../model/impl/DefaultModuleDefinition.java | 167 +++
.../model/impl/DefaultModuleDefinitionSet.java | 243 ++++
.../cloudstack/spring/module/util/Main.java | 58 +
.../spring/module/util/ModuleLocationUtils.java | 53 +
.../web/CloudStackContextLoaderListener.java | 75 ++
.../module/model/impl/defaults-context.xml | 28 +
.../spring/module/factory/InitTest.java | 39 +
.../factory/ModuleBasedContextFactoryTest.java | 121 ++
...ClasspathModuleDefinitionSetLocatorTest.java | 40 +
.../model/impl/DefaultModuleDefinitionTest.java | 131 ++
.../resources/testfiles/all/defaults.properties | 18 +
.../testfiles/all/empty-context-inheritable.xml | 26 +
.../resources/testfiles/all/empty-context.xml | 26 +
.../all/empty2-context-inheritable.xml | 26 +
.../resources/testfiles/all/empty2-context.xml | 26 +
.../resources/testfiles/all/module.properties | 17 +
.../testfiles/all/test2-defaults.properties | 17 +
.../testfiles/badname/module.properties | 17 +
.../testfiles/blankname/module.properties | 18 +
.../resources/testfiles/good/empty-context.xml | 26 +
.../resources/testfiles/good/module.properties | 17 +
.../testfiles/missingname/module.properties | 17 +
.../testfiles/wrongname/module.properties | 17 +
.../testhierarchy/base/module.properties | 17 +
.../base/test-context-inheritable.xml | 28 +
.../testhierarchy/base/test-context.xml | 34 +
.../testhierarchy/child1-1/module.properties | 18 +
.../testhierarchy/child1-1/test-context.xml | 34 +
.../testhierarchy/child1/module.properties | 18 +
.../child1/test-context-override.xml | 30 +
.../testhierarchy/child1/test-context.xml | 38 +
.../testhierarchy/child2/module.properties | 18 +
.../testhierarchy/child2/test-context.xml | 33 +
.../testhierarchy/orphan1/module.properties | 18 +
.../testhierarchy/orphan1/test-context.xml | 30 +
packaging/centos63/cloud.spec | 3 +-
.../acl-static-role-based/module.properties | 2 +
.../spring-acl-static-role-based-context.xml | 34 +
.../explicit-dedication/module.properties | 2 +
.../spring-explicit-dedication-context.xml | 36 +
.../affinity/ExplicitDedicationProcessor.java | 32 +-
.../host-anti-affinity/module.properties | 2 +
.../spring-host-anti-affinity-context.xml | 37 +
.../discovery/ApiDiscoveryServiceImpl.java | 65 +-
.../cloudstack/discovery/ApiDiscoveryTest.java | 2 +-
.../cloudstack/rate-limit/module.properties | 2 +
.../rate-limit/spring-rate-limit-context.xml | 32 +
.../spring-dedicated-resources-core-context.xml | 33 +
.../dedicated/DedicatedResourceManagerImpl.java | 273 ++--
.../implicit-dedication/module.properties | 2 +
.../spring-implicit-dedication-context.xml | 25 +
.../user-concentrated-pod/module.properties | 2 +
.../spring-user-concentrated-pod-context.xml | 35 +
.../src/com/cloud/netapp/NetappManagerImpl.java | 10 +-
.../host-allocator-random/module.properties | 2 +
.../spring-host-allocator-random-context.xml | 34 +
.../baremetal-compute/module.properties | 2 +
.../spring-baremetal-compute-context.xml | 35 +
.../baremetal-discoverer/module.properties | 2 +
.../spring-baremetal-discoverer-context.xml | 34 +
.../baremetal-network/module.properties | 2 +
.../spring-baremetal-network-context.xml | 46 +
.../baremetal-planner/module.properties | 2 +
.../spring-baremetal-planner-context.xml | 34 +
.../baremetal-storage/module.properties | 2 +
.../spring-baremetal-storage-context.xml | 32 +
.../core/spring-baremetal-core-context.xml | 42 +
.../BareMetalPingServiceImpl.java | 3 -
.../networkservice/BaremetaNetworkGuru.java | 21 +-
.../networkservice/BaremetalDhcpElement.java | 4 -
.../BaremetalDhcpManagerImpl.java | 4 -
.../BaremetalKickStartServiceImpl.java | 7 +-
.../networkservice/BaremetalPxeElement.java | 4 -
.../cloudstack/kvm-compute/module.properties | 2 +
.../kvm-compute/spring-kvm-compute-context.xml | 34 +
.../cloudstack/ovm-compute/module.properties | 2 +
.../ovm-compute/spring-ovm-compute-context.xml | 39 +
.../cloudstack/ovm-discoverer/module.properties | 2 +
.../spring-ovm-discoverer-context.xml | 34 +
.../core/spring-simulator-core-context.xml | 45 +
.../simulator-compute/module.properties | 2 +
.../spring-simulator-compute-context.xml | 34 +
.../simulator-discoverer/module.properties | 2 +
.../spring-simulator-discover-context.xml | 36 +
.../simulator-planner/module.properties | 2 +
.../simulator-planner/spring-context.xml | 34 +
.../simulator-storage/module.properties | 2 +
.../spring-simulator-storage-context.xml | 33 +
.../agent/manager/MockAgentManagerImpl.java | 95 +-
.../agent/manager/MockStorageManagerImpl.java | 170 +--
.../cloud/agent/manager/MockVmManagerImpl.java | 46 +-
.../agent/manager/SimulatorManagerImpl.java | 10 +-
.../simulator/dao/MockConfigurationDaoImpl.java | 4 +-
.../cloudstack/core/spring-ucs-core-context.xml | 35 +
.../com/cloud/ucs/manager/UcsManagerImpl.java | 3 -
.../core/spring-vmware-core-context.xml | 43 +
.../cloudstack/vmware-compute/module.properties | 2 +
.../spring-vmware-compute-context.xml | 43 +
.../vmware-compute/vmware-defaults.properties | 1 +
.../vmware-discoverer/module.properties | 2 +
.../spring-vmware-discoverer-context.xml | 35 +
.../cloudstack/vmware-network/module.properties | 2 +
.../spring-vmware-network-context.xml | 34 +
.../cloudstack/vmware-storage/module.properties | 2 +
.../spring-vmware-storage-context.xml | 33 +
.../vmware/VmwareServerDiscoverer.java | 33 +-
.../vmware/manager/VmwareManagerImpl.java | 53 +-
.../network/CiscoNexusVSMDeviceManagerImpl.java | 68 +-
.../network/element/CiscoNexusVSMElement.java | 50 +-
.../xenserver-compute/module.properties | 2 +
.../spring-xenserver-compute-context.xml | 28 +
.../xenserver-discoverer/module.properties | 2 +
.../spring-xenserver-discoverer-context.xml | 25 +
.../META-INF/cloudstack/vns/module.properties | 2 +
.../cloudstack/vns/spring-vns-context.xml | 36 +
.../network/element/BigSwitchVnsElement.java | 45 +-
.../cloud/network/element/CiscoVnmcElement.java | 263 ++--
.../META-INF/cloudstack/elb/module.properties | 2 +
.../cloudstack/elb/spring-elb-context.xml | 34 +
.../lb/ElasticLoadBalancerManagerImpl.java | 32 +-
.../core/spring-internallb-core-context.xml | 37 +
.../cloudstack/midonet/module.properties | 2 +
.../midonet/spring-midonet-context.xml | 37 +
.../network/guru/MidoNetPublicNetworkGuru.java | 19 +-
.../cloud/network/element/NetscalerElement.java | 52 +-
.../META-INF/cloudstack/nvp/module.properties | 2 +
.../cloudstack/nvp/spring-nvp-context.xml | 40 +
.../cloud/network/element/NiciraNvpElement.java | 45 +-
.../META-INF/cloudstack/ovs/module.properties | 2 +
.../cloudstack/ovs/spring-ovs-context.xml | 40 +
.../META-INF/cloudstack/ssp/module.properties | 2 +
.../cloudstack/ssp/spring-ssp-context.xml | 42 +
.../META-INF/cloudstack/vxlan/module.properties | 2 +
.../cloudstack/vxlan/spring-vxlan-context.xml | 34 +
.../storage-image-default/module.properties | 2 +
.../spring-storage-image-default-context.xml | 33 +
.../storage-image-s3/module.properties | 2 +
.../spring-storage-image-s3-context.xml | 34 +
.../storage-image-swift/module.properties | 2 +
.../spring-storage-image-swift-context.xml | 33 +
.../storage-volume-default/module.properties | 2 +
.../spring-storage-volume-default-context.xml | 35 +
.../storage-volume-solidfire/module.properties | 2 +
.../spring-storage-volume-solidfire-context.xml | 33 +
.../cloudstack/storage/test/AopTestAdvice.java | 4 +-
.../META-INF/cloudstack/ldap/module.properties | 2 +
.../cloudstack/ldap/spring-ldap-context.xml | 39 +
.../META-INF/cloudstack/md5/module.properties | 2 +
.../cloudstack/md5/spring-md5-context.xml | 34 +
.../cloudstack/plaintext/module.properties | 2 +
.../plaintext/spring-plaintext-context.xml | 35 +
.../cloudstack/sha256salted/module.properties | 2 +
.../spring-sha256salted-context.xml | 34 +
pom.xml | 15 +-
quickcloud/pom.xml | 30 +
.../spring-quickcloud-core-context-override.xml | 32 +
server/pom.xml | 3 -
.../spring-server-core-managers-context.xml | 216 ++++
.../core/spring-server-core-misc-context.xml | 68 +
.../module.properties | 2 +
...ing-server-alert-adapter-backend-context.xml | 32 +
.../module.properties | 2 +
...ing-server-alert-adapter-compute-context.xml | 32 +
.../module.properties | 2 +
...ing-server-alert-adapter-storage-context.xml | 32 +
.../server-allocator/module.properties | 2 +
.../spring-server-allocator-context.xml | 48 +
.../cloudstack/server-api/module.properties | 2 +
.../server-api/spring-server-api-context.xml | 33 +
.../cloudstack/server-compute/module.properties | 2 +
.../spring-server-compute-context.xml | 38 +
.../server-discoverer/module.properties | 2 +
.../spring-server-discoverer-context.xml | 45 +
.../cloudstack/server-fencer/module.properties | 2 +
.../spring-server-fencer-context.xml | 37 +
.../server-investigator/module.properties | 2 +
.../spring-server-investigator-context.xml | 46 +
.../cloudstack/server-network/module.properties | 2 +
.../spring-server-network-context.xml | 64 +
.../cloudstack/server-planner/module.properties | 2 +
.../spring-server-planner-context.xml | 34 +
.../cloudstack/server-storage/module.properties | 2 +
.../spring-server-storage-context.xml | 34 +
.../server-template-adapter/module.properties | 2 +
.../spring-server-template-adapter-context.xml | 32 +
server/src/com/cloud/api/ApiServer.java | 72 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 321 ++---
.../configuration/ConfigurationManagerImpl.java | 882 +++++++------
.../consoleproxy/ConsoleProxyManagerImpl.java | 34 +-
.../consoleproxy/StaticConsoleProxyManager.java | 3 +
.../cloud/dc/dao/DedicatedResourceDaoImpl.java | 3 +-
.../deploy/DeploymentPlanningManagerImpl.java | 157 +--
.../com/cloud/event/ActionEventInterceptor.java | 33 +-
.../ha/HighAvailabilityManagerExtImpl.java | 7 +-
.../cloud/ha/dao/HighAvailabilityDaoImpl.java | 3 +-
.../metadata/ResourceMetaDataManagerImpl.java | 86 +-
.../network/ExternalDeviceUsageManagerImpl.java | 155 +--
.../ExternalFirewallDeviceManagerImpl.java | 46 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 171 ++-
.../com/cloud/network/IpAddressManagerImpl.java | 988 ++++++++-------
.../com/cloud/network/NetworkServiceImpl.java | 605 ++++-----
.../cloud/network/NetworkUsageManagerImpl.java | 50 +-
.../cloud/network/PortProfileManagerImpl.java | 39 +-
.../network/StorageNetworkManagerImpl.java | 169 +--
.../cloud/network/as/AutoScaleManagerImpl.java | 191 +--
.../network/firewall/FirewallManagerImpl.java | 93 +-
.../cloud/network/guru/DirectNetworkGuru.java | 121 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 113 +-
.../cloud/network/guru/GuestNetworkGuru.java | 17 +-
.../cloud/network/guru/PublicNetworkGuru.java | 20 +-
.../lb/LoadBalancingRulesManagerImpl.java | 395 +++---
.../VirtualNetworkApplianceManagerImpl.java | 347 +++--
.../cloud/network/rules/RulesManagerImpl.java | 227 ++--
.../security/SecurityGroupManagerImpl.java | 526 ++++----
.../network/vpc/NetworkACLManagerImpl.java | 40 +-
.../com/cloud/network/vpc/VpcManagerImpl.java | 639 +++++-----
.../network/vpn/RemoteAccessVpnManagerImpl.java | 224 ++--
.../com/cloud/projects/ProjectManagerImpl.java | 365 +++---
.../com/cloud/resource/ResourceManagerImpl.java | 305 +++--
.../resourcelimit/ResourceLimitManagerImpl.java | 333 ++---
.../cloud/server/ConfigurationServerImpl.java | 561 ++++----
.../com/cloud/server/ManagementServerImpl.java | 101 +-
server/src/com/cloud/server/StatsCollector.java | 247 ++--
.../com/cloud/servlet/CloudStartupServlet.java | 3 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 3 +-
.../com/cloud/storage/StorageManagerImpl.java | 62 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 144 ++-
.../storage/snapshot/SnapshotManagerImpl.java | 14 +-
.../cloud/tags/TaggedResourceManagerImpl.java | 110 +-
.../com/cloud/template/TemplateManagerImpl.java | 100 +-
server/src/com/cloud/test/DatabaseConfig.java | 67 +-
server/src/com/cloud/test/IPRangeConfig.java | 15 +-
server/src/com/cloud/test/PodZoneConfig.java | 7 +-
.../src/com/cloud/usage/UsageServiceImpl.java | 10 +-
.../src/com/cloud/user/AccountManagerImpl.java | 190 +--
.../src/com/cloud/user/DomainManagerImpl.java | 70 +-
.../cloud/uuididentity/dao/IdentityDaoImpl.java | 13 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 690 +++++-----
.../vm/snapshot/VMSnapshotManagerImpl.java | 45 +-
.../affinity/AffinityGroupServiceImpl.java | 107 +-
.../lb/ApplicationLoadBalancerManagerImpl.java | 52 +-
.../GlobalLoadBalancingRulesServiceImpl.java | 219 ++--
.../configuration/ConfigurationManagerTest.java | 20 +-
.../cloud/network/CreatePrivateNetworkTest.java | 6 +-
.../network/DedicateGuestVlanRangesTest.java | 18 +-
.../network/UpdatePhysicalNetworkTest.java | 5 +-
...GlobalLoadBalancingRulesServiceImplTest.java | 28 +-
.../module.properties | 2 +
...ing-secondary-storage-discoverer-context.xml | 36 +
usage/src/com/cloud/usage/UsageManagerImpl.java | 16 +-
.../src/com/cloud/usage/UsageSanityChecker.java | 4 +-
utils/pom.xml | 4 +
.../cloud/utils/component/ComponentContext.java | 27 +-
.../cloud/utils/exception/ExceptionUtil.java | 12 +
.../utils/exception/ExceptionUtilTest.java | 48 +
501 files changed, 17382 insertions(+), 10409 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81d01369/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81d01369/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java
----------------------------------------------------------------------
diff --cc engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java
index 213b47a,55d6142..47c988f
--- a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java
+++ b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java
@@@ -73,22 -72,18 +73,23 @@@ public class DataMotionServiceImpl impl
public void copyAsync(Map<VolumeInfo, DataStore> volumeMap, VirtualMachineTO vmTo, Host srcHost, Host destHost,
AsyncCompletionCallback<CopyCommandResult> callback) {
- StrategyPriority.sortStrategies(strategies, volumeMap, srcHost, destHost);
-
- for (DataMotionStrategy strategy : strategies) {
- if (strategy.canHandle(volumeMap, srcHost, destHost) != Priority.CANT_HANDLE) {
- strategy.copyAsync(volumeMap, vmTo, srcHost, destHost, callback);
- return;
+ // TODO DRY this out when the overloaded methods are DRYed out
+ DataMotionStrategy strategy = StrategyPriority.pickStrategy(strategies, volumeMap, srcHost, destHost);
+ if (strategy == null) {
+ List<String> volumeIds = new LinkedList<String>();
+ for (final VolumeInfo volumeInfo : volumeMap.keySet()) {
+ volumeIds.add(volumeInfo.getUuid());
}
+
+ throw new CloudRuntimeException("Can't find strategy to move data. "+
+ "Source Host: "+srcHost.getName()+", Destination Host: "+destHost.getName()+
+ ", Volume UUIDs: "+StringUtils.join(volumeIds, ","));
}
- throw new CloudRuntimeException("can't find strategy to move data");
+
+ strategy.copyAsync(volumeMap, vmTo, srcHost, destHost, callback);
}
+ @Inject
public void setStrategies(List<DataMotionStrategy> strategies) {
this.strategies = strategies;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81d01369/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------