Merge branch 'master' into object_store
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2fb5358e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2fb5358e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2fb5358e Branch: refs/heads/object_store Commit: 2fb5358e3e54a5966975a8e7f95fea2d3cf19f09 Parents: 657f530 f8471e5 Author: Min Chen <[email protected]> Authored: Fri Mar 29 13:57:40 2013 -0700 Committer: Min Chen <[email protected]> Committed: Fri Mar 29 13:57:40 2013 -0700 ---------------------------------------------------------------------- api/src/com/cloud/configuration/Resource.java | 7 +- api/src/com/cloud/event/EventTypes.java | 5 + api/src/com/cloud/network/RemoteAccessVpn.java | 4 +- .../cloud/network/vpn/RemoteAccessVpnService.java | 2 +- api/src/com/cloud/server/ResourceTag.java | 3 +- api/src/com/cloud/storage/VolumeApiService.java | 5 +- api/src/org/apache/cloudstack/api/BaseCmd.java | 1 - .../user/resource/UpdateResourceCountCmd.java | 6 +- .../user/resource/UpdateResourceLimitCmd.java | 6 +- .../api/command/user/vm/ListNicsCmd.java | 2 +- .../api/command/user/volume/ResizeVolumeCmd.java | 3 +- .../command/user/vpn/DeleteRemoteAccessVpnCmd.java | 2 +- .../cloudstack/api/response/AccountResponse.java | 54 ++- .../api/response/RemoteAccessVpnResponse.java | 7 + .../api/response/ResourceCountResponse.java | 2 +- .../api/response/ResourceLimitResponse.java | 2 +- awsapi/conf/applicationContext.xml.in | 24 +- .../WEB-INF/classes/resources/messages.properties | 12 + client/pom.xml | 5 + client/tomcatconf/applicationContext.xml.in | 643 ++++++++++++++- client/tomcatconf/componentContext.xml.in | 430 ++++------ client/tomcatconf/log4j-cloud.xml.in | 15 + client/tomcatconf/nonossComponentContext.xml.in | 487 ++++++------ packaging/centos63/cloud.spec | 3 +- plugins/alert-handlers/syslog-alerts/pom.xml | 40 + .../cloudstack/syslog/AlertsSyslogAppender.java | 336 ++++++++ .../syslog/AlertsSyslogAppenderTest.java | 61 ++ .../manager/BareMetalTemplateAdapter.java | 15 +- .../api/commands/DeleteBigSwitchVnsDeviceCmd.java | 4 +- .../api/commands/ListBigSwitchVnsDevicesCmd.java | 8 +- .../api/response/BigSwitchVnsDeviceResponse.java | 4 + .../com/cloud/network/BigSwitchVnsDeviceVO.java | 4 +- .../com/cloud/network/bigswitch/Attachment.java | 38 - .../cloud/network/bigswitch/AttachmentData.java | 50 ++ .../cloud/network/bigswitch/BigSwitchVnsApi.java | 39 +- .../network/bigswitch/ControlClusterStatus.java | 4 + .../src/com/cloud/network/bigswitch/Network.java | 74 -- .../com/cloud/network/bigswitch/NetworkData.java | 86 ++ .../src/com/cloud/network/bigswitch/Port.java | 56 -- .../src/com/cloud/network/bigswitch/PortData.java | 68 ++ .../cloud/network/element/BigSwitchVnsElement.java | 14 +- .../network/guru/BigSwitchVnsGuestNetworkGuru.java | 4 +- .../network/resource/BigSwitchVnsResource.java | 40 +- .../cloud/network/bigswitch/BigSwitchApiTest.java | 18 +- .../network/resource/BigSwitchVnsResourceTest.java | 44 +- plugins/pom.xml | 1 + server/pom.xml | 8 + .../com/cloud/upgrade/databaseCreatorContext.xml | 52 ++ .../cloud/agent/manager/ClusteredAgentAttache.java | 13 +- server/src/com/cloud/alert/AlertManagerImpl.java | 3 +- server/src/com/cloud/api/ApiDispatcher.java | 5 +- server/src/com/cloud/api/ApiResponseHelper.java | 150 +++- server/src/com/cloud/api/ApiServer.java | 39 +- .../cloud/api/query/dao/AccountJoinDaoImpl.java | 18 + .../src/com/cloud/api/query/vo/AccountJoinVO.java | 54 ++ .../src/com/cloud/cluster/ClusterManagerImpl.java | 4 +- server/src/com/cloud/configuration/Config.java | 5 +- server/src/com/cloud/deploy/FirstFitPlanner.java | 24 +- .../com/cloud/event/ActionEventInterceptor.java | 52 +- .../com/cloud/ha/HighAvailabilityManagerImpl.java | 20 +- .../ExternalLoadBalancerDeviceManagerImpl.java | 2 +- .../src/com/cloud/network/NetworkManagerImpl.java | 59 +- server/src/com/cloud/network/NetworkModelImpl.java | 18 +- .../src/com/cloud/network/NetworkServiceImpl.java | 4 + .../com/cloud/network/dao/RemoteAccessVpnVO.java | 29 +- .../router/VirtualNetworkApplianceManagerImpl.java | 19 +- .../network/vpn/RemoteAccessVpnManagerImpl.java | 30 +- .../com/cloud/resource/ResourceManagerImpl.java | 24 +- .../resourcelimit/ResourceLimitManagerImpl.java | 97 ++- .../src/com/cloud/server/ManagementServerImpl.java | 117 +++- server/src/com/cloud/server/StatsCollector.java | 3 +- .../src/com/cloud/storage/StorageManagerImpl.java | 26 +- server/src/com/cloud/storage/VolumeManager.java | 3 +- .../src/com/cloud/storage/VolumeManagerImpl.java | 95 ++- server/src/com/cloud/storage/dao/SnapshotDao.java | 12 +- .../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 65 +- server/src/com/cloud/storage/dao/VolumeDao.java | 66 +- .../src/com/cloud/storage/dao/VolumeDaoImpl.java | 48 +- .../cloud/storage/download/DownloadListener.java | 62 ++- .../storage/download/DownloadMonitorImpl.java | 56 ++- .../storage/snapshot/SnapshotManagerImpl.java | 70 +- .../com/cloud/tags/TaggedResourceManagerImpl.java | 8 +- .../cloud/template/HypervisorTemplateAdapter.java | 29 +- .../com/cloud/template/TemplateManagerImpl.java | 47 +- server/src/com/cloud/upgrade/DatabaseCreator.java | 7 + .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 41 +- server/src/com/cloud/user/AccountManagerImpl.java | 14 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 15 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 18 +- .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 9 +- .../ResourceLimitManagerImplTest.java | 18 +- .../cloud/vpc/MockResourceLimitManagerImpl.java | 8 + .../networkoffering/CreateNetworkOfferingTest.java | 19 +- .../test/resources/CloneSettingDaoTestContext.xml | 20 +- .../resources/SecurityGroupManagerTestContext.xml | 19 +- server/test/resources/SnapshotDaoTestContext.xml | 20 +- .../test/resources/StoragePoolDaoTestContext.xml | 20 +- server/test/resources/VpcApiUnitTestContext.xml | 20 +- server/test/resources/VpcTestContext.xml | 21 +- server/test/resources/createNetworkOffering.xml | 22 +- server/test/resources/testContext.xml | 27 +- setup/db/db/schema-40to410.sql | 31 +- setup/db/db/schema-410to420-cleanup.sql | 7 + setup/db/db/schema-410to420.sql | 156 ++++- ui/dictionary.jsp | 13 +- ui/scripts/accounts.js | 137 +++- ui/scripts/domains.js | 92 ++ ui/scripts/instanceWizard.js | 60 +- ui/scripts/projects.js | 20 +- ui/scripts/storage.js | 8 +- ui/scripts/system.js | 373 +++++++++- ui/scripts/vpc.js | 87 ++ ui/scripts/zoneWizard.js | 32 +- usage/resources/usageApplicationContext.xml | 17 +- usage/src/com/cloud/usage/UsageServer.java | 17 +- utils/src/com/cloud/utils/UriUtils.java | 33 + .../src/com/cloud/utils/component/AdapterBase.java | 4 +- .../cloud/utils/component/ComponentContext.java | 32 +- .../ComponentInstantiationPostProcessor.java | 152 ++++ .../component/ComponentMethodInterceptable.java | 24 + .../component/ComponentMethodInterceptor.java | 27 + .../utils/component/ComponentNamingPolicy.java | 63 ++ .../src/com/cloud/utils/component/ManagerBase.java | 2 +- utils/src/com/cloud/utils/db/GenericDaoBase.java | 29 +- .../cloud/utils/db/TransactionContextBuilder.java | 70 +-- .../utils/log/CglibThrowableRendererTest.java | 2 +- utils/test/resources/testContext.xml | 20 +- 127 files changed, 4516 insertions(+), 1484 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fb5358e/setup/db/db/schema-410to420.sql ----------------------------------------------------------------------
