cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/ui-restyle to 500c798
Date Thu, 24 Oct 2013 18:31:28 GMT
Merge branch 'master' into ui-restyle

Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/dictionary.jsp


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/500c798f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/500c798f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/500c798f

Branch: refs/heads/ui-restyle
Commit: 500c798f75a134e6edfc74440a3ce31bde2b4bfd
Parents: aa9ff0e c5fdf29
Author: Brian Federle <brian.federle@citrix.com>
Authored: Thu Oct 24 11:22:05 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Thu Oct 24 11:22:05 2013 -0700

----------------------------------------------------------------------
 agent/pom.xml                                   |    4 +
 agent/src/com/cloud/agent/Agent.java            |    1 -
 agent/src/com/cloud/agent/AgentShell.java       |   61 +-
 agent/test/com/cloud/agent/AgentShellTest.java  |   48 +
 .../cloudstack/api-planner/module.properties    |   18 +
 .../api-planner/spring-api-planner-context.xml  |   34 +
 api/src/com/cloud/agent/api/to/S3TO.java        |   31 +-
 api/src/com/cloud/event/EventTypes.java         |    1 +
 .../exception/ConcurrentOperationException.java |    3 +-
 .../element/RemoteAccessVPNServiceProvider.java |    5 +-
 api/src/com/cloud/offering/NetworkOffering.java |    2 +
 .../cloud/server/ResourceMetaDataService.java   |    9 +-
 api/src/com/cloud/server/ResourceTag.java       |   61 +-
 .../com/cloud/server/TaggedResourceService.java |   30 +-
 api/src/com/cloud/vm/UserVmService.java         |    5 +
 api/src/com/cloud/vm/VmDetailConstants.java     |    1 +
 .../org/apache/cloudstack/api/ApiConstants.java |    9 +-
 .../admin/network/CreateNetworkOfferingCmd.java |    9 +-
 .../admin/network/UpdateNetworkOfferingCmd.java |    7 +
 .../api/command/admin/vm/ExpungeVMCmd.java      |  116 +
 .../command/user/network/UpdateNetworkCmd.java  |    4 +-
 .../user/offering/ListServiceOfferingsCmd.java  |   24 -
 .../command/user/ssh/CreateSSHKeyPairCmd.java   |    6 +-
 .../api/command/user/tag/CreateTagsCmd.java     |    4 +-
 .../api/command/user/tag/DeleteTagsCmd.java     |    4 +-
 .../api/command/user/vm/DestroyVMCmd.java       |   27 +-
 .../user/volume/AddResourceDetailCmd.java       |    2 +-
 .../user/volume/ListResourceDetailsCmd.java     |    2 +-
 .../user/volume/RemoveResourceDetailCmd.java    |   17 +-
 .../command/user/volume/UpdateVolumeCmd.java    |    6 +-
 .../api/command/user/zone/ListZonesByCmd.java   |   32 +-
 .../api/response/CreateSSHKeyPairResponse.java  |   41 +
 .../api/response/SSHKeyPairResponse.java        |   16 -
 .../api/response/ServiceOfferingResponse.java   |   10 -
 .../api/response/SnapshotResponse.java          |   25 +-
 .../cloudstack/api/response/UserVmResponse.java |    9 +-
 .../cloudstack/api/response/ZoneResponse.java   |   15 +
 .../apache/cloudstack/context/CallContext.java  |   48 +-
 .../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 +-
 .../classes/resources/messages.properties       |    6 +
 client/WEB-INF/web.xml                          |    6 +-
 client/pom.xml                                  |   56 +-
 .../cloudstack/webApplicationContext.xml        |   32 +
 client/tomcatconf/applicationContext.xml.in     |  956 ------
 client/tomcatconf/commands.properties.in        |    3 +-
 client/tomcatconf/componentContext.xml.in       |  324 --
 client/tomcatconf/log4j-cloud.xml.in            |    8 +
 client/tomcatconf/nonossComponentContext.xml.in |  421 ---
 .../tomcatconf/simulatorComponentContext.xml.in |  284 --
 client/tomcatconf/tomcat6-nonssl.conf.in        |    2 +-
 client/tomcatconf/tomcat6-ssl.conf.in           |    2 +-
 .../cloudstack/allocator/module.properties      |   18 +
 .../allocator/spring-core-allocator-context.xml |   32 +
 ...-lifecycle-allocator-context-inheritable.xml |   42 +
 .../META-INF/cloudstack/api/module.properties   |   18 +
 ...g-core-lifecycle-api-context-inheritable.xml |   53 +
 .../cloudstack/backend/module.properties        |   18 +
 .../cloudstack/bootstrap/module.properties      |   17 +
 .../spring-bootstrap-context-inheritable.xml    |   39 +
 .../bootstrap/spring-bootstrap-context.xml      |   32 +
 .../cloudstack/compute/module.properties        |   18 +
 ...re-lifecycle-compute-context-inheritable.xml |   45 +
 .../META-INF/cloudstack/core/module.properties  |   18 +
 .../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     |   18 +
 ...lifecycle-discoverer-context-inheritable.xml |   35 +
 .../cloudstack/network/module.properties        |   18 +
 ...re-lifecycle-network-context-inheritable.xml |   58 +
 .../cloudstack/planner/module.properties        |   18 +
 ...re-lifecycle-planner-context-inheritable.xml |   41 +
 .../cloudstack/storage/module.properties        |   18 +
 ...ng-lifecycle-storage-context-inheritable.xml |   74 +
 .../cloudstack/system/module.properties         |   18 +
 .../spring-core-system-context-inheritable.xml  |   54 +
 .../system/spring-core-system-context.xml       |   50 +
 .../com/cloud/agent/api/ClusterSyncAnswer.java  |    8 +-
 .../cloud/agent/api/StartupRoutingCommand.java  |    8 +-
 core/src/com/cloud/agent/api/StopAnswer.java    |   23 +-
 .../api/routing/LoadBalancerConfigCommand.java  |    4 +-
 .../virtualnetwork/VirtualRoutingResource.java  |   25 +-
 .../com/cloud/network/HAProxyConfigurator.java  |   54 +-
 .../StorageSubsystemCommandHandlerBase.java     |    5 +-
 .../storage/template/S3TemplateDownloader.java  |    3 +-
 .../cloud/network/HAProxyConfiguratorTest.java  |   97 +
 debian/cloudstack-management.install            |    3 -
 debian/control                                  |    2 +-
 .../core/spring-engine-api-core-context.xml     |   44 +
 .../api/storage/DataMotionStrategy.java         |    4 +-
 .../subsystem/api/storage/SnapshotInfo.java     |    2 +
 .../subsystem/api/storage/SnapshotStrategy.java |    9 +-
 .../api/storage/StorageStrategyFactory.java     |   36 +
 .../subsystem/api/storage/StrategyPriority.java |   86 +-
 .../api/storage/StrategyPriorityTest.java       |  116 -
 ...pring-engine-components-api-core-context.xml |   30 +
 .../configuration/ConfigurationManager.java     |    2 +-
 ...spring-engine-orchestration-core-context.xml |   71 +
 .../cloud/agent/manager/AgentManagerImpl.java   |    5 +-
 .../manager/ClusteredAgentManagerImpl.java      |    4 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  390 ++-
 .../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      |  916 ++---
 .../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 |   33 +-
 .../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 |    8 +-
 .../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 |   16 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java |   10 +-
 .../com/cloud/network/dao/NetworkDaoImpl.java   |   14 +-
 .../cloud/network/dao/PortProfileDaoImpl.java   |    4 +-
 .../security/dao/SecurityGroupDaoImpl.java      |   12 +-
 .../security/dao/SecurityGroupWorkDaoImpl.java  |    8 +-
 .../security/dao/VmRulesetLogDaoImpl.java       |    8 +-
 .../cloud/network/vpc/dao/PrivateIpDaoImpl.java |    4 +-
 .../network/vpc/dao/StaticRouteDaoImpl.java     |    8 +-
 .../com/cloud/network/vpc/dao/VpcDaoImpl.java   |   12 +-
 .../network/vpc/dao/VpcOfferingDaoImpl.java     |    4 +-
 .../com/cloud/offerings/NetworkOfferingVO.java  |   12 +
 .../offerings/dao/NetworkOfferingDaoImpl.java   |    6 +-
 .../com/cloud/projects/dao/ProjectDaoImpl.java  |    8 +-
 .../dao/ServiceOfferingDetailsDaoImpl.java      |    4 +-
 .../cloud/storage/VMTemplateStoragePoolVO.java  |    2 +-
 .../storage/dao/LaunchPermissionDaoImpl.java    |    6 +-
 .../com/cloud/storage/dao/SnapshotDaoImpl.java  |   18 +-
 .../storage/dao/StoragePoolDetailsDaoImpl.java  |    4 +-
 .../storage/dao/StoragePoolHostDaoImpl.java     |   10 +-
 .../storage/dao/StoragePoolWorkDaoImpl.java     |    4 +-
 .../com/cloud/storage/dao/VMTemplateDao.java    |    3 +
 .../cloud/storage/dao/VMTemplateDaoImpl.java    |   39 +-
 .../cloud/storage/dao/VMTemplateDetailsDao.java |    4 +
 .../storage/dao/VMTemplateDetailsDaoImpl.java   |   28 +-
 .../storage/dao/VMTemplateHostDaoImpl.java      |    8 +-
 .../storage/dao/VMTemplatePoolDaoImpl.java      |    8 +-
 .../storage/dao/VMTemplateZoneDaoImpl.java      |    4 +-
 .../com/cloud/storage/dao/VolumeDaoImpl.java    |   16 +-
 .../cloud/storage/dao/VolumeDetailsDaoImpl.java |    4 +-
 .../src/com/cloud/tags/ResourceTagVO.java       |    6 +-
 .../src/com/cloud/tags/dao/ResourceTagDao.java  |    6 +-
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java |    6 +-
 .../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/NicDetailDao.java      |    2 +-
 .../src/com/cloud/vm/dao/NicDetailDaoImpl.java  |    8 +-
 .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java |    8 +-
 .../src/com/cloud/vm/dao/UserVmDaoImpl.java     |   12 +-
 .../src/com/cloud/vm/dao/UserVmDetailsDao.java  |    7 +-
 .../com/cloud/vm/dao/UserVmDetailsDaoImpl.java  |   22 +-
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java |   16 +-
 .../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 |   34 +
 ...ngine-storage-datamotion-storage-context.xml |   34 +
 .../motion/AncientDataMotionStrategy.java       |   10 +-
 .../storage/motion/DataMotionServiceImpl.java   |   42 +-
 ...spring-engine-storage-image-core-context.xml |   45 +
 .../storage/image/TemplateDataFactoryImpl.java  |    8 +-
 .../cloudstack/storage/test/AopTestAdvice.java  |    3 +-
 .../storage/test/CloudStackTestNGBase.java      |    5 +-
 .../test/FakePrimaryDataStoreDriver.java        |    7 +-
 .../storage/test/MockStorageMotionStrategy.java |   10 +-
 .../cloudstack/storage/test/SnapshotTest.java   |   58 +-
 .../cloudstack/storage/test/TestNGAop.java      |    4 +-
 .../test/resources/storageContext.xml           |    1 +
 .../core/spring-engine-storage-core-context.xml |   68 +
 .../storage-allocator/module.properties         |   18 +
 ...engine-storage-storage-allocator-context.xml |   49 +
 ...ing-engine-storage-snapshot-core-context.xml |   41 +
 ...-engine-storage-snapshot-storage-context.xml |   33 +
 .../storage/snapshot/SnapshotObject.java        |   40 +-
 .../snapshot/XenserverSnapshotStrategy.java     |    8 +-
 .../ClusterScopeStoragePoolAllocator.java       |   19 +-
 .../allocator/LocalStoragePoolAllocator.java    |   19 +-
 .../allocator/ZoneWideStoragePoolAllocator.java |   31 +-
 .../provider/DataStoreProviderManagerImpl.java  |  112 +-
 .../endpoint/DefaultEndPointSelector.java       |    3 +-
 .../helper/StorageStrategyFactoryImpl.java      |  114 +
 .../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 +-
 .../api/storage/StrategyPriorityTest.java       |  161 +
 ...pring-engine-storage-volume-core-context.xml |   49 +
 .../storage/datastore/PrimaryDataStoreImpl.java |   83 +-
 .../storage/volume/VolumeServiceImpl.java       |   28 +-
 .../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 +
 .../framework/config/dao/ConfigurationDao.java  |    2 +
 .../config/dao/ConfigurationDaoImpl.java        |   24 +-
 .../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 |   25 +
 .../utils/db/TransactionCallbackNoReturn.java   |   31 +
 .../db/TransactionCallbackWithException.java    |   25 +
 ...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   |   25 +
 .../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-management.rc          |    4 +-
 packaging/centos63/cloud.spec                   |   18 +-
 packaging/centos63/cloudstack-sccs              |   20 +
 .../debian/config/opt/cloud/bin/savepassword.sh |   62 +
 .../acl-static-role-based/module.properties     |   18 +
 .../spring-acl-static-role-based-context.xml    |   34 +
 .../explicit-dedication/module.properties       |   18 +
 .../spring-explicit-dedication-context.xml      |   36 +
 .../affinity/ExplicitDedicationProcessor.java   |   32 +-
 .../host-anti-affinity/module.properties        |   18 +
 .../spring-host-anti-affinity-context.xml       |   37 +
 .../discovery/ApiDiscoveryServiceImpl.java      |   65 +-
 .../cloudstack/discovery/ApiDiscoveryTest.java  |    2 +-
 .../cloudstack/rate-limit/module.properties     |   18 +
 .../rate-limit/spring-rate-limit-context.xml    |   32 +
 .../spring-dedicated-resources-core-context.xml |   33 +
 .../dedicated/DedicatedResourceManagerImpl.java |  273 +-
 .../implicit-dedication/module.properties       |   18 +
 .../spring-implicit-dedication-context.xml      |   25 +
 .../user-concentrated-pod/module.properties     |   18 +
 .../spring-user-concentrated-pod-context.xml    |   35 +
 .../src/com/cloud/netapp/NetappManagerImpl.java |   10 +-
 .../host-allocator-random/module.properties     |   18 +
 .../spring-host-allocator-random-context.xml    |   34 +
 .../baremetal-compute/module.properties         |   18 +
 .../spring-baremetal-compute-context.xml        |   35 +
 .../baremetal-discoverer/module.properties      |   18 +
 .../spring-baremetal-discoverer-context.xml     |   34 +
 .../baremetal-network/module.properties         |   18 +
 .../spring-baremetal-network-context.xml        |   46 +
 .../baremetal-planner/module.properties         |   18 +
 .../spring-baremetal-planner-context.xml        |   34 +
 .../baremetal-storage/module.properties         |   18 +
 .../spring-baremetal-storage-context.xml        |   32 +
 .../core/spring-baremetal-core-context.xml      |   42 +
 .../BareMetalPingServiceImpl.java               |    3 -
 .../networkservice/BareMetalResourceBase.java   |    2 +-
 .../networkservice/BaremetaNetworkGuru.java     |   21 +-
 .../networkservice/BaremetalDhcpElement.java    |    4 -
 .../BaremetalDhcpManagerImpl.java               |    4 -
 .../BaremetalKickStartServiceImpl.java          |    7 +-
 .../networkservice/BaremetalPxeElement.java     |    4 -
 .../cloudstack/kvm-compute/module.properties    |   18 +
 .../kvm-compute/spring-kvm-compute-context.xml  |   34 +
 .../kvm/resource/LibvirtComputingResource.java  |    4 +-
 .../cloudstack/ovm-compute/module.properties    |   18 +
 .../ovm-compute/spring-ovm-compute-context.xml  |   39 +
 .../cloudstack/ovm-discoverer/module.properties |   18 +
 .../spring-ovm-discoverer-context.xml           |   34 +
 .../cloud/ovm/hypervisor/OvmResourceBase.java   |    4 +-
 .../core/spring-simulator-core-context.xml      |   45 +
 .../simulator-compute/module.properties         |   18 +
 .../spring-simulator-compute-context.xml        |   34 +
 .../simulator-discoverer/module.properties      |   18 +
 .../spring-simulator-discover-context.xml       |   36 +
 .../simulator-planner/module.properties         |   18 +
 .../simulator-planner/spring-context.xml        |   34 +
 .../simulator-storage/module.properties         |   18 +
 .../spring-simulator-storage-context.xml        |   33 +
 .../agent/manager/MockAgentManagerImpl.java     |   95 +-
 .../agent/manager/MockStorageManagerImpl.java   |  170 +-
 .../cloud/agent/manager/MockVmManagerImpl.java  |   48 +-
 .../agent/manager/SimulatorManagerImpl.java     |   10 +-
 .../cloud/resource/AgentRoutingResource.java    |    2 +-
 .../simulator/dao/MockConfigurationDaoImpl.java |    4 +-
 .../motion/SimulatorDataMotionStrategy.java     |   10 +-
 .../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 |   18 +
 .../spring-vmware-compute-context.xml           |   43 +
 .../vmware-compute/vmware-defaults.properties   |   17 +
 .../vmware-discoverer/module.properties         |   18 +
 .../spring-vmware-discoverer-context.xml        |   35 +
 .../cloudstack/vmware-network/module.properties |   18 +
 .../spring-vmware-network-context.xml           |   34 +
 .../cloudstack/vmware-storage/module.properties |   18 +
 .../spring-vmware-storage-context.xml           |   33 +
 .../vmware/VmwareServerDiscoverer.java          |   33 +-
 .../vmware/manager/VmwareManagerImpl.java       |   53 +-
 .../vmware/resource/VmwareResource.java         |   12 +-
 .../network/CiscoNexusVSMDeviceManagerImpl.java |   68 +-
 .../network/element/CiscoNexusVSMElement.java   |   50 +-
 .../motion/VmwareStorageMotionStrategy.java     |   12 +-
 .../motion/VmwareStorageMotionStrategyTest.java |   10 +-
 .../xenserver-compute/module.properties         |   18 +
 .../spring-xenserver-compute-context.xml        |   28 +
 .../xenserver-discoverer/module.properties      |   18 +
 .../spring-xenserver-discoverer-context.xml     |   25 +
 .../xen/resource/CitrixResourceBase.java        |  117 +-
 .../xen/resource/XenServer56FP1Resource.java    |   26 +-
 .../xen/resource/XenServer610Resource.java      |   22 +
 .../xen/resource/XenServerPoolVms.java          |   39 +-
 .../motion/XenServerStorageMotionStrategy.java  |   12 +-
 .../META-INF/cloudstack/vns/module.properties   |   18 +
 .../cloudstack/vns/spring-vns-context.xml       |   36 +
 .../network/element/BigSwitchVnsElement.java    |   45 +-
 .../cloud/network/element/CiscoVnmcElement.java |  263 +-
 .../META-INF/cloudstack/elb/module.properties   |   18 +
 .../cloudstack/elb/spring-elb-context.xml       |   34 +
 .../lb/ElasticLoadBalancerManagerImpl.java      |   34 +-
 .../core/spring-internallb-core-context.xml     |   37 +
 .../lb/InternalLoadBalancerVMManagerImpl.java   |    2 +-
 .../JuniperSRXExternalFirewallElement.java      |   38 +-
 .../cloudstack/midonet/module.properties        |   18 +
 .../midonet/spring-midonet-context.xml          |   37 +
 .../network/guru/MidoNetPublicNetworkGuru.java  |   19 +-
 .../cloud/network/element/NetscalerElement.java |   52 +-
 .../META-INF/cloudstack/nvp/module.properties   |   18 +
 .../cloudstack/nvp/spring-nvp-context.xml       |   40 +
 .../cloud/network/element/NiciraNvpElement.java |   45 +-
 .../META-INF/cloudstack/ovs/module.properties   |   18 +
 .../cloudstack/ovs/spring-ovs-context.xml       |   40 +
 .../META-INF/cloudstack/ssp/module.properties   |   18 +
 .../cloudstack/ssp/spring-ssp-context.xml       |   42 +
 .../META-INF/cloudstack/vxlan/module.properties |   18 +
 .../cloudstack/vxlan/spring-vxlan-context.xml   |   34 +
 .../storage-image-default/module.properties     |   18 +
 .../spring-storage-image-default-context.xml    |   33 +
 .../storage-image-s3/module.properties          |   18 +
 .../spring-storage-image-s3-context.xml         |   34 +
 .../driver/S3ImageStoreDriverImpl.java          |   12 +-
 .../storage-image-swift/module.properties       |   18 +
 .../spring-storage-image-swift-context.xml      |   33 +
 .../storage-volume-default/module.properties    |   18 +
 .../spring-storage-volume-default-context.xml   |   35 +
 .../CloudStackPrimaryDataStoreDriverImpl.java   |   49 +-
 ...CloudStackPrimaryDataStoreLifeCycleImpl.java |    2 +
 .../SamplePrimaryDataStoreDriverImpl.java       |   22 +-
 .../storage-volume-solidfire/module.properties  |   18 +
 .../spring-storage-volume-solidfire-context.xml |   33 +
 .../driver/SolidfirePrimaryDataStoreDriver.java |   73 +-
 .../cloudstack/storage/test/AopTestAdvice.java  |    4 +-
 .../META-INF/cloudstack/ldap/module.properties  |   18 +
 .../cloudstack/ldap/spring-ldap-context.xml     |   39 +
 .../META-INF/cloudstack/md5/module.properties   |   18 +
 .../cloudstack/md5/spring-md5-context.xml       |   34 +
 .../cloudstack/plaintext/module.properties      |   18 +
 .../plaintext/spring-plaintext-context.xml      |   35 +
 .../cloudstack/sha256salted/module.properties   |   18 +
 .../spring-sha256salted-context.xml             |   34 +
 pom.xml                                         |   17 +-
 python/lib/cloudutils/serviceConfig.py          |    2 +-
 quickcloud/pom.xml                              |   30 +
 .../spring-quickcloud-core-context-override.xml |   32 +
 .../vm/hypervisor/xenserver/setupxenserver.sh   |    2 +-
 scripts/vm/hypervisor/xenserver/vmops           |    2 +-
 server/conf/cloudstack-sudoers.in               |    2 +-
 server/pom.xml                                  |   15 +-
 .../spring-server-core-managers-context.xml     |  214 ++
 .../core/spring-server-core-misc-context.xml    |   68 +
 .../module.properties                           |   18 +
 ...ing-server-alert-adapter-backend-context.xml |   32 +
 .../module.properties                           |   18 +
 ...ing-server-alert-adapter-compute-context.xml |   32 +
 .../module.properties                           |   18 +
 ...ing-server-alert-adapter-storage-context.xml |   32 +
 .../server-allocator/module.properties          |   18 +
 .../spring-server-allocator-context.xml         |   48 +
 .../cloudstack/server-api/module.properties     |   18 +
 .../server-api/spring-server-api-context.xml    |   33 +
 .../cloudstack/server-compute/module.properties |   18 +
 .../spring-server-compute-context.xml           |   38 +
 .../server-discoverer/module.properties         |   18 +
 .../spring-server-discoverer-context.xml        |   45 +
 .../cloudstack/server-fencer/module.properties  |   18 +
 .../spring-server-fencer-context.xml            |   37 +
 .../server-investigator/module.properties       |   18 +
 .../spring-server-investigator-context.xml      |   46 +
 .../cloudstack/server-network/module.properties |   18 +
 .../spring-server-network-context.xml           |   64 +
 .../cloudstack/server-planner/module.properties |   18 +
 .../spring-server-planner-context.xml           |   34 +
 .../cloudstack/server-storage/module.properties |   18 +
 .../spring-server-storage-context.xml           |   34 +
 .../server-template-adapter/module.properties   |   18 +
 .../spring-server-template-adapter-context.xml  |   32 +
 server/src/com/cloud/api/ApiDBUtils.java        |    8 +-
 server/src/com/cloud/api/ApiResponseHelper.java |   50 +-
 server/src/com/cloud/api/ApiServer.java         |   72 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |  136 +-
 .../api/query/dao/DataCenterJoinDaoImpl.java    |   20 +-
 .../cloud/api/query/dao/ResourceTagJoinDao.java |    4 +-
 .../api/query/dao/ResourceTagJoinDaoImpl.java   |    4 +-
 .../query/dao/ServiceOfferingJoinDaoImpl.java   |    9 -
 .../cloud/api/query/dao/UserVmJoinDaoImpl.java  |   13 +-
 .../com/cloud/api/query/vo/ProjectJoinVO.java   |    6 +-
 .../cloud/api/query/vo/ResourceTagJoinVO.java   |    6 +-
 .../cloud/api/query/vo/SecurityGroupJoinVO.java |    6 +-
 .../com/cloud/api/query/vo/TemplateJoinVO.java  |    6 +-
 .../com/cloud/api/query/vo/UserVmJoinVO.java    |   21 +-
 .../com/cloud/api/query/vo/VolumeJoinVO.java    |    6 +-
 .../com/cloud/capacity/CapacityManagerImpl.java |  321 +-
 server/src/com/cloud/configuration/Config.java  |    7 +-
 .../configuration/ConfigurationManagerImpl.java |  925 ++---
 .../consoleproxy/ConsoleProxyManagerImpl.java   |   34 +-
 .../consoleproxy/StaticConsoleProxyManager.java |    3 +
 .../cloud/dc/dao/DedicatedResourceDaoImpl.java  |    3 +-
 .../deploy/DeploymentPlanningManagerImpl.java   |  190 +-
 .../com/cloud/event/ActionEventInterceptor.java |   33 +-
 .../ha/HighAvailabilityManagerExtImpl.java      |    7 +-
 .../cloud/ha/dao/HighAvailabilityDaoImpl.java   |    3 +-
 .../cloud/hypervisor/HypervisorGuruBase.java    |   10 +-
 .../metadata/ResourceMetaDataManagerImpl.java   |  255 +-
 .../network/ExternalDeviceUsageManagerImpl.java |  155 +-
 .../ExternalFirewallDeviceManagerImpl.java      |   46 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java  |  171 +-
 .../com/cloud/network/IpAddressManagerImpl.java |  988 +++---
 .../com/cloud/network/NetworkServiceImpl.java   |  609 ++--
 .../cloud/network/NetworkUsageManagerImpl.java  |   50 +-
 .../cloud/network/PortProfileManagerImpl.java   |   39 +-
 .../network/StorageNetworkManagerImpl.java      |  169 +-
 .../cloud/network/as/AutoScaleManagerImpl.java  |  191 +-
 .../network/element/VirtualRouterElement.java   |    8 +-
 .../network/firewall/FirewallManagerImpl.java   |   97 +-
 .../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       |  399 ++-
 .../VirtualNetworkApplianceManagerImpl.java     |  456 ++-
 .../cloud/network/rules/RulesManagerImpl.java   |  231 +-
 .../security/SecurityGroupManagerImpl.java      |  526 +--
 .../network/vpc/NetworkACLManagerImpl.java      |   40 +-
 .../network/vpc/NetworkACLServiceImpl.java      |    4 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java   |  645 ++--
 .../network/vpn/RemoteAccessVpnManagerImpl.java |  228 +-
 .../com/cloud/projects/ProjectManagerImpl.java  |  365 +-
 .../com/cloud/resource/ResourceManagerImpl.java |  305 +-
 .../resourcelimit/ResourceLimitManagerImpl.java |  333 +-
 .../cloud/server/ConfigurationServerImpl.java   |  637 ++--
 .../com/cloud/server/ManagementServerImpl.java  |  115 +-
 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 |  176 +-
 .../storage/snapshot/SnapshotManagerImpl.java   |   72 +-
 .../cloud/tags/TaggedResourceManagerImpl.java   |  176 +-
 .../com/cloud/template/TemplateAdapterBase.java |   17 +
 .../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   |   28 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |  192 +-
 .../src/com/cloud/user/DomainManagerImpl.java   |   70 +-
 .../com/cloud/uuididentity/dao/IdentityDao.java |    4 +-
 .../cloud/uuididentity/dao/IdentityDaoImpl.java |   19 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |  763 +++--
 .../vm/snapshot/VMSnapshotManagerImpl.java      |   45 +-
 .../affinity/AffinityGroupServiceImpl.java      |  107 +-
 .../lb/ApplicationLoadBalancerManagerImpl.java  |   56 +-
 .../cloudstack/region/RegionManagerImpl.java    |    2 +-
 .../GlobalLoadBalancingRulesServiceImpl.java    |  219 +-
 .../configuration/ConfigurationManagerTest.java |   20 +-
 .../metadata/ResourceMetaDataManagerTest.java   |   31 +-
 .../cloud/network/CreatePrivateNetworkTest.java |    6 +-
 .../network/DedicateGuestVlanRangesTest.java    |   18 +-
 .../network/UpdatePhysicalNetworkTest.java      |    5 +-
 .../vpn/MockRemoteAccessVPNServiceProvider.java |    5 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java |    2 +-
 .../cloud/vpc/dao/MockConfigurationDaoImpl.java |   11 +-
 .../CreateNetworkOfferingTest.java              |   20 +-
 .../cloudstack/region/RegionManagerTest.java    |   29 +-
 ...GlobalLoadBalancingRulesServiceImplTest.java |   28 +-
 .../module.properties                           |   18 +
 ...ing-secondary-storage-discoverer-context.xml |   36 +
 .../resource/NfsSecondaryStorageResource.java   |    6 +-
 setup/db/db/schema-420to421.sql                 |  193 +-
 setup/db/db/schema-421to430.sql                 |    2 +
 setup/dev/advanced.cfg                          |    6 +-
 .../debian/config/etc/init.d/cloud-early-config |    1 +
 .../debian/config/opt/cloud/bin/savepassword.sh |   65 +
 .../redundant_router/check_heartbeat.sh.templ   |    5 +-
 .../config/root/redundant_router/fault.sh.templ |    4 +
 .../patches/debian/config/root/savepassword.sh  |   58 -
 .../component/maint/test_multiple_ip_ranges.py  |  207 ++
 .../memory_limits/test_domain_limits.py         |   58 +-
 .../component/test_egress_fw_rules.py           |  108 +-
 .../component/test_netscaler_nw_off.py          |    9 +-
 .../component/test_persistent_networks.py       |  290 ++
 .../component/test_reset_ssh_keypair.py         |  145 +-
 tools/appliance/definitions/devcloud/base.sh    |    2 +-
 .../definitions/systemvm64template/base.sh      |   25 +
 .../definitions/systemvm64template/cleanup.sh   |   20 +
 .../systemvm64template/definition.rb            |   45 +
 .../systemvm64template/postinstall.sh           |  253 ++
 .../definitions/systemvm64template/preseed.cfg  |  357 ++
 .../definitions/systemvm64template/zerodisk.sh  |   15 +
 .../definitions/systemvmtemplate/base.sh        |    2 +-
 .../definitions/systemvmtemplate/definition.rb  |    2 +-
 .../definitions/systemvmtemplate/postinstall.sh |   10 +-
 .../definitions/systemvmtemplate64/base.sh      |   25 -
 .../definitions/systemvmtemplate64/cleanup.sh   |   20 -
 .../systemvmtemplate64/definition.rb            |   45 -
 .../systemvmtemplate64/postinstall.sh           |  252 --
 .../definitions/systemvmtemplate64/preseed.cfg  |  357 --
 .../definitions/systemvmtemplate64/zerodisk.sh  |   15 -
 .../src/deps/boxes/basebox-build/postinstall.sh |    2 +-
 tools/marvin/marvin/cloudstackConnection.py     |  120 +-
 tools/marvin/marvin/cloudstackTestClient.py     |   55 +-
 tools/marvin/marvin/codegenerator.py            |    2 +-
 tools/marvin/marvin/codes.py                    |   35 +
 tools/marvin/marvin/configGenerator.py          |    9 +-
 tools/marvin/marvin/deployDataCenter.py         |   54 +-
 tools/marvin/marvin/marvinPlugin.py             |   23 +-
 ui/css/cloudstack3.css                          |   25 +-
 ui/dictionary.jsp                               |    6 +
 ui/index.jsp                                    | 3233 +++++++++---------
 ui/scripts/accounts.js                          |   30 +
 ui/scripts/instanceWizard.js                    |    3 +
 ui/scripts/instances.js                         |   93 +-
 ui/scripts/network.js                           |  239 +-
 ui/scripts/sharedFunctions.js                   |    1 +
 ui/scripts/storage.js                           |    2 +-
 ui/scripts/system.js                            |   39 +-
 ui/scripts/templates.js                         |  105 +-
 ui/scripts/ui-custom/instanceWizard.js          |   29 +-
 ui/scripts/ui/dialog.js                         |    8 +-
 ui/scripts/ui/widgets/detailView.js             |    7 +
 ui/scripts/ui/widgets/listView.js               |    3 +
 usage/src/com/cloud/usage/UsageManagerImpl.java |   16 +-
 .../src/com/cloud/usage/UsageSanityChecker.java |    4 +-
 utils/pom.xml                                   |   29 +
 utils/src/com/cloud/utils/DateUtil.java         |   41 +-
 utils/src/com/cloud/utils/PropertiesUtil.java   |   16 +
 utils/src/com/cloud/utils/S3Utils.java          |    4 +
 .../cloud/utils/component/ComponentContext.java |   27 +-
 .../cloud/utils/exception/ExceptionUtil.java    |   12 +
 utils/src/com/cloud/utils/net/NetUtils.java     |   12 +
 utils/src/com/cloud/utils/ssh/SshHelper.java    |   10 +-
 .../com/cloud/utils/PropertiesUtilsTest.java    |   41 +
 .../utils/exception/ExceptionUtilTest.java      |   48 +
 .../vmware/util/VmwareContextPool.java          |    4 +-
 700 files changed, 25215 insertions(+), 14713 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/500c798f/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --cc client/WEB-INF/classes/resources/messages.properties
index 161d948,e5b06ec..5536b07
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@@ -14,10 -14,7 +14,11 @@@
  # KIND, either express or implied.  See the License for the
  # specific language governing permissions and limitations
  # under the License.
 +message.select.compute.offering=Please select a compute offering to associate with this
instance.
 +message.select.disk.offering=(Optional) Select an additional disk offering to attach to
this instance.
 +label.home=Home
 +label.use.default.language=Use default language
+ label.root.disk.size=Root disk size
  label.s3.nfs.server=S3 NFS Server
  label.s3.nfs.path=S3 NFS Path
  label.delete.events=Delete events

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/500c798f/ui/dictionary.jsp
----------------------------------------------------------------------
diff --cc ui/dictionary.jsp
index 752a433,f9fe088..8db8308
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@@ -25,10 -25,7 +25,11 @@@ under the License
  <% long now = System.currentTimeMillis(); %>
  <script language="javascript">
  dictionary = {
 +'message.select.compute.offering': '<fmt:message key="message.select.compute.offering"
/>',
 +'message.select.disk.offering': '<fmt:message key="message.select.disk.offering" />',
 +'label.home': '<fmt:message key="label.home" />',
 +'label.use.default.language': '<fmt:message key="label.use.default.language" />',
+ 'label.root.disk.size': '<fmt:message key="label.root.disk.size" />',
  'label.s3.nfs.path': '<fmt:message key="label.s3.nfs.path" />',
  'label.s3.nfs.server': '<fmt:message key="label.s3.nfs.server" />',
  'label.delete.events': '<fmt:message key="label.delete.events" />',


Mime
View raw message