cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [6/29] git commit: refs/heads/master - Merge branch 'master' into ui-multiple-nics
Date Thu, 14 Mar 2013 17:57:53 GMT
Merge branch 'master' into ui-multiple-nics


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

Branch: refs/heads/master
Commit: e653c02515483f9b6958945be122e14986e97b1d
Parents: 243b20f 97ca779
Author: Brian Federle <brian.federle@citrix.com>
Authored: Thu Feb 28 12:47:36 2013 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Thu Feb 28 12:47:36 2013 -0800

----------------------------------------------------------------------
 agent/pom.xml                                      |   22 +-
 api/src/com/cloud/agent/api/ScaleVmAnswer.java     |   28 +
 api/src/com/cloud/agent/api/ScaleVmCommand.java    |  113 ++
 .../com/cloud/agent/api/to/VirtualMachineTO.java   |   31 +
 api/src/com/cloud/dc/DataCenter.java               |    4 +
 api/src/com/cloud/network/Network.java             |    1 +
 api/src/com/cloud/network/TrafficLabel.java        |   36 +
 api/src/com/cloud/network/vpc/VpcService.java      |    2 +-
 api/src/com/cloud/user/AccountService.java         |    4 +-
 api/src/com/cloud/user/DomainService.java          |    2 +-
 api/src/com/cloud/vm/NicProfile.java               |   18 +
 api/src/org/apache/cloudstack/api/ACL.java         |    4 +
 .../org/apache/cloudstack/api/ApiConstants.java    |   12 +-
 .../apache/cloudstack/api/ServerApiException.java  |   11 +-
 .../command/admin/account/CreateAccountCmd.java    |   28 +-
 .../command/admin/account/DeleteAccountCmd.java    |    7 -
 .../command/admin/account/DisableAccountCmd.java   |   15 +-
 .../command/admin/account/EnableAccountCmd.java    |    8 +-
 .../command/admin/account/UpdateAccountCmd.java    |   10 +-
 .../api/command/admin/cluster/AddClusterCmd.java   |   28 +
 .../api/command/admin/domain/CreateDomainCmd.java  |   16 +-
 .../api/command/admin/domain/DeleteDomainCmd.java  |    7 -
 .../api/command/admin/domain/UpdateDomainCmd.java  |    7 -
 .../admin/storage/CreateStoragePoolCmd.java        |    4 +-
 .../api/command/admin/user/CreateUserCmd.java      |   16 +-
 .../api/command/admin/user/DeleteUserCmd.java      |    7 -
 .../api/command/admin/user/DisableUserCmd.java     |    7 -
 .../api/command/admin/user/EnableUserCmd.java      |    7 -
 .../api/command/admin/user/UpdateUserCmd.java      |    7 -
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |   31 +-
 .../api/command/admin/zone/CreateZoneCmd.java      |   14 +
 .../api/command/admin/zone/UpdateZoneCmd.java      |   14 +
 .../api/command/user/vm/DeployVMCmd.java           |   11 +-
 .../api/command/user/zone/ListZonesByCmd.java      |    7 +
 .../api/response/DomainRouterResponse.java         |   22 +
 .../cloudstack/api/response/ZoneResponse.java      |   22 +
 .../apache/cloudstack/region/RegionService.java    |  136 +-
 awsapi/pom.xml                                     |    2 +-
 .../WEB-INF/classes/resources/messages.properties  |    7 +
 client/WEB-INF/web.xml                             |    2 +-
 client/pom.xml                                     |   33 +-
 client/tomcatconf/componentContext.xml.in          |   13 +-
 client/tomcatconf/components.xml.in                |    4 -
 client/tomcatconf/nonossComponentContext.xml.in    |   21 +-
 core/src/com/cloud/storage/DiskOfferingVO.java     |    4 +
 .../cloud/storage/template/RawImageProcessor.java  |    1 +
 core/src/com/cloud/user/AccountVO.java             |   40 +-
 core/src/com/cloud/user/UserVO.java                |   23 +-
 core/src/com/cloud/vm/UserVmCloneSettingVO.java    |   50 +
 debian/README                                      |    6 -
 debian/changelog                                   |    6 +
 debian/cloud-agent-deps.install                    |   18 -
 debian/cloud-agent-libs.install                    |   19 -
 debian/cloud-agent.config                          |   17 -
 debian/cloud-agent.install                         |   25 -
 debian/cloud-agent.postinst                        |   34 -
 debian/cloud-cli.config                            |   17 -
 debian/cloud-cli.install                           |   21 -
 debian/cloud-client-ui.install                     |   19 -
 debian/cloud-client.config                         |   17 -
 debian/cloud-client.install                        |   58 -
 debian/cloud-client.postinst                       |   49 -
 debian/cloud-core.install                          |   19 -
 debian/cloud-deps.install                          |   34 -
 debian/cloud-management.config                     |   17 -
 debian/cloud-python.install                        |   18 -
 debian/cloud-scripts.install                       |   27 -
 debian/cloud-server.install                        |   32 -
 debian/cloud-setup.install                         |   25 -
 debian/cloud-system-iso.install                    |   18 -
 debian/cloud-usage.install                         |   23 -
 debian/cloud-usage.postinst                        |   47 -
 debian/cloud-utils.install                         |   22 -
 debian/cloudstack-agent.install                    |   25 +
 debian/cloudstack-awsapi.install                   |   18 +
 debian/cloudstack-cli.install                      |   16 +
 debian/cloudstack-common.install                   |   33 +
 debian/cloudstack-docs.install                     |   16 +
 debian/cloudstack-management.install               |   31 +
 debian/cloudstack-management.postinst              |   26 +
 debian/cloudstack-usage.install                    |   21 +
 debian/control                                     |  133 +--
 debian/rules                                       |  124 ++-
 developer/pom.xml                                  |    4 +
 docs/en-US/event-framework.xml                     |  110 ++
 docs/en-US/events.xml                              |   18 +-
 docs/en-US/management-server-install-client.xml    |   28 +-
 docs/en-US/management-server-install-db-local.xml  |   59 +-
 .../en-US/management-server-install-nfs-shares.xml |    2 +-
 docs/en-US/nfs-shares-on-management-server.xml     |    4 +-
 docs/en-US/vlan-provisioning.xml                   |   23 +-
 docs/publican-cloudstack/defaults.cfg              |    2 +-
 docs/publican-cloudstack/en-US/Legal_Notice.xml    |    9 +
 .../en-US/images/title_logo.svg                    |   32 +-
 docs/publican-cloudstack/publican-cloudstack.spec  |    6 +-
 .../cloud/entity/api/VirtualMachineEntity.java     |    4 +-
 .../api/storage/StoragePoolAllocator.java          |   45 +
 .../engine/cloud/entity/api/VMEntityManager.java   |    5 +-
 .../cloud/entity/api/VMEntityManagerImpl.java      |    5 +-
 .../entity/api/VirtualMachineEntityFactory.java    |    3 +-
 .../cloud/entity/api/VirtualMachineEntityImpl.java |   15 +-
 .../entity/api/db/EngineDataCenterVO.java          |   28 +-
 .../platform/orchestration/CloudOrchestrator.java  |   13 +-
 .../engine/provisioning/test/ProvisioningTest.java |    2 +-
 engine/storage/integration-test/pom.xml            |   23 +
 .../storage/allocator/StorageAllocatorTest.java    |  439 +++++++
 .../StorageAllocatorTestConfiguration.java         |   79 ++
 .../storage/test/ChildTestConfiguration.java       |  182 ++--
 .../cloudstack/storage/test/DirectAgentTest.java   |    2 +-
 .../cloudstack/storage/test/TestConfiguration.java |    8 -
 .../cloudstack/storage/test/volumeServiceTest.java |    2 +-
 .../test/resource/StorageAllocatorTestContext.xml  |   45 +
 .../test/resource/storageContext.xml               |   48 +-
 .../storage/HypervsiorHostEndPointRpcServer.java   |   10 +-
 .../allocator/AbstractStoragePoolAllocator.java    |  192 +++
 .../ClusterScopeStoragePoolAllocator.java          |  105 ++
 .../GarbageCollectingStoragePoolAllocator.java     |   91 ++
 .../allocator/LocalStoragePoolAllocator.java       |  126 ++
 .../allocator/UseLocalForRootAllocator.java        |   61 +
 .../allocator/ZoneWideStoragePoolAllocator.java    |   80 ++
 .../storage/motion/AncientDataMotionStrategy.java  |   20 +-
 .../AncientPrimaryDataStoreLifeCyclImpl.java       |  958 --------------
 .../AncientPrimaryDataStoreLifeCycleImpl.java      |  963 +++++++++++++++
 .../AncientPrimaryDataStoreProviderImpl.java       |    4 +-
 .../cloudstack/framework/events/EventBus.java      |    4 +-
 framework/rest/pom.xml                             |    4 +
 packaging/centos63/cloud-agent.rc                  |    2 +-
 packaging/centos63/cloud-usage.rc                  |    4 +-
 packaging/centos63/cloud.spec                      |   35 +-
 packaging/debian/init/cloud-agent                  |  167 +++
 packaging/debian/init/cloud-management             |  244 ++++
 packaging/debian/init/cloud-usage                  |  131 ++
 packaging/debian/replace.properties                |    6 +-
 .../debian/config/etc/init.d/cloud-early-config    |   42 +-
 .../root/redundant_router/arping_gateways.sh.templ |    4 +-
 .../cloudstack/mom/rabbitmq/RabbitMQEventBus.java  |  111 +-
 plugins/hypervisors/kvm/pom.xml                    |   68 +-
 .../kvm/resource/LibvirtComputingResource.java     |   16 +-
 .../kvm/resource/LibvirtComputingResourceTest.java |  184 +++
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |  257 ++++-
 .../hypervisor/vmware/manager/VmwareManager.java   |    7 +-
 .../vmware/manager/VmwareManagerImpl.java          |   75 +-
 .../hypervisor/vmware/resource/VmwareResource.java |  219 +++--
 .../src/com/cloud/network/VmwareTrafficLabel.java  |  118 ++
 .../xen/discoverer/XcpServerDiscoverer.java        |   10 +-
 plugins/storage-allocators/random/pom.xml          |   10 +-
 .../allocator/RandomStoragePoolAllocator.java      |   91 --
 .../allocator/RandomStoragePoolAllocator.java      |   78 ++
 .../apache/cloudstack/storage/test/VolumeTest.java |    4 +-
 pom.xml                                            |    3 +-
 python/lib/cloudutils/utilities.py                 |    9 +-
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh    |   46 +-
 scripts/vm/network/security_group.py               |   10 +-
 server/conf/migration-components.xml               |    1 +
 server/pom.xml                                     |   37 +
 server/src/com/cloud/api/ApiDispatcher.java        |   20 +-
 .../src/com/cloud/api/query/QueryManagerImpl.java  |    3 +
 .../cloud/api/query/dao/DataCenterJoinDaoImpl.java |    2 +
 .../api/query/dao/DomainRouterJoinDaoImpl.java     |    3 +
 .../com/cloud/api/query/vo/DataCenterJoinVO.java   |   22 +
 .../com/cloud/api/query/vo/DomainRouterJoinVO.java |   20 +
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |   11 +-
 .../agentlb/dao/HostTransferMapDaoImpl.java        |   50 +-
 server/src/com/cloud/configuration/Config.java     |   10 +-
 .../cloud/configuration/ConfigurationManager.java  |    4 +-
 .../configuration/ConfigurationManagerImpl.java    |   44 +-
 server/src/com/cloud/dc/DataCenterVO.java          |   30 +-
 server/src/com/cloud/deploy/FirstFitPlanner.java   |   11 +-
 server/src/com/cloud/event/ActionEventUtils.java   |   19 +-
 server/src/com/cloud/event/AlertGenerator.java     |   21 +-
 server/src/com/cloud/event/UsageEventUtils.java    |   21 +-
 server/src/com/cloud/host/dao/HostDaoImpl.java     |    5 +
 .../ExternalLoadBalancerUsageManagerImpl.java      |  263 +++--
 .../src/com/cloud/network/NetworkManagerImpl.java  |   24 +-
 server/src/com/cloud/network/NetworkModelImpl.java |   13 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |    2 +-
 .../com/cloud/network/NetworkStateListener.java    |   13 +-
 server/src/com/cloud/network/addr/PublicIp.java    |    4 +
 .../network/element/VpcVirtualRouterElement.java   |    4 +-
 .../com/cloud/network/guru/DirectNetworkGuru.java  |    2 +
 .../com/cloud/network/guru/GuestNetworkGuru.java   |    2 -
 .../router/VirtualNetworkApplianceManagerImpl.java |   46 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |    6 +-
 server/src/com/cloud/network/vpc/VpcManager.java   |    3 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |  196 +++-
 .../src/com/cloud/network/vpc/VpcServiceMapVO.java |   90 ++
 server/src/com/cloud/network/vpc/dao/VpcDao.java   |    5 +
 .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java  |   27 +
 .../cloud/network/vpc/dao/VpcServiceMapDao.java    |   40 +
 .../network/vpc/dao/VpcServiceMapDaoImpl.java      |  115 ++
 .../src/com/cloud/projects/ProjectManagerImpl.java |    2 +-
 server/src/com/cloud/resource/ResourceManager.java |    1 +
 .../com/cloud/resource/ResourceManagerImpl.java    |   18 +
 .../com/cloud/server/ConfigurationServerImpl.java  |   22 +-
 .../server/auth/DefaultUserAuthenticator.java      |    3 -
 .../src/com/cloud/storage/StorageManagerImpl.java  |   86 +-
 .../src/com/cloud/storage/VolumeManagerImpl.java   |    2 +-
 .../allocator/AbstractStoragePoolAllocator.java    |  209 ----
 .../allocator/FirstFitStoragePoolAllocator.java    |  175 ---
 .../GarbageCollectingStoragePoolAllocator.java     |  105 --
 .../allocator/LocalStoragePoolAllocator.java       |  288 -----
 .../storage/allocator/StoragePoolAllocator.java    |   53 -
 .../allocator/UseLocalForRootAllocator.java        |   83 --
 .../src/com/cloud/storage/dao/StoragePoolDao.java  |   12 +-
 .../com/cloud/storage/dao/StoragePoolDaoImpl.java  |   93 ++-
 .../cloud/storage/dao/VMTemplateHostDaoImpl.java   |    1 -
 .../cloud/storage/download/DownloadListener.java   |    8 +-
 .../storage/download/DownloadMonitorImpl.java      |   50 +-
 .../storage/listener/SnapshotStateListener.java    |   18 +-
 .../storage/listener/VolumeStateListener.java      |   15 +-
 .../cloud/template/HyervisorTemplateAdapter.java   |   21 +-
 .../com/cloud/template/TemplateAdapterBase.java    |    2 +
 .../com/cloud/template/TemplateManagerImpl.java    |   57 +-
 server/src/com/cloud/upgrade/DatabaseCreator.java  |   16 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   10 +-
 .../src/com/cloud/upgrade/dao/Upgrade40to41.java   |  102 ++-
 .../src/com/cloud/upgrade/dao/Upgrade410to420.java |   94 ++-
 .../src/com/cloud/upgrade/dao/VersionDaoImpl.java  |    2 +-
 server/src/com/cloud/user/AccountManager.java      |   14 +-
 server/src/com/cloud/user/AccountManagerImpl.java  |   90 +--
 server/src/com/cloud/user/DomainManager.java       |    2 +-
 server/src/com/cloud/user/DomainManagerImpl.java   |   24 +-
 server/src/com/cloud/user/dao/AccountDaoImpl.java  |   90 +-
 .../com/cloud/user/dao/UserStatisticsDaoImpl.java  |   18 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |  245 ++--
 server/src/com/cloud/vm/UserVmStateListener.java   |   17 +-
 .../com/cloud/vm/dao/UserVmCloneSettingDao.java    |   37 +
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java    |   74 ++
 server/src/com/cloud/vm/dao/UserVmDao.java         |    2 +
 server/src/com/cloud/vm/dao/UserVmDaoImpl.java     |   35 +-
 server/src/com/cloud/vm/dao/UserVmDetailsDao.java  |    3 -
 server/src/com/cloud/vm/dao/VMInstanceDao.java     |    3 +-
 server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java |   14 +-
 .../apache/cloudstack/region/RegionManager.java    |  204 +---
 .../cloudstack/region/RegionManagerImpl.java       |  822 ++-----------
 .../cloudstack/region/RegionServiceImpl.java       |  230 ++---
 .../apache/cloudstack/region/RegionsApiUtil.java   |  306 -----
 .../cloud/resource/MockResourceManagerImpl.java    |    7 +
 .../com/cloud/user/MockAccountManagerImpl.java     |   46 +-
 .../test/com/cloud/user/MockDomainManagerImpl.java |   38 +-
 .../vm/dao/UserVmCloneSettingDaoImplTest.java      |   62 +
 .../UserVmCloneSettingDaoTestConfiguration.java    |   52 +
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    2 +-
 server/test/com/cloud/vpc/MockVpcManagerImpl.java  |   12 +-
 server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java  |   13 +-
 .../cloudstack/region/RegionManagerTest.java       |   35 +-
 .../test/resources/CloneSettingDaoTestContext.xml  |   42 +
 setup/bindir/cloud-setup-databases.in              |    3 +
 setup/db/db/schema-40to410.sql                     |   17 +-
 setup/db/db/schema-410to420.sql                    |   29 +-
 setup/db/templates.sql                             |    9 +-
 test/integration/smoke/test_vm_life_cycle.py       |    6 -
 tools/apidoc/generateadmincommands.xsl             |    8 +
 tools/appliance/build.sh                           |   39 +-
 .../appliance/definitions/systemvmtemplate/base.sh |    4 +-
 .../definitions/systemvmtemplate/cleanup.sh        |    2 +
 .../definitions/systemvmtemplate/definition.rb     |    2 +-
 .../definitions/systemvmtemplate/postinstall.sh    |  125 ++-
 .../definitions/systemvmtemplate/preseed.cfg       |    8 +-
 .../definitions/systemvmtemplate/zerodisk.sh       |   17 +-
 tools/marvin/marvin/codegenerator.py               |   20 +
 ui/css/cloudstack3.css                             |  207 +++-
 ui/dictionary.jsp                                  |    7 +
 ui/images/bg-what-is-cloudstack.png                |  Bin 32240 -> 36083 bytes
 ui/images/logo-login-oss.png                       |  Bin 2534 -> 4567 bytes
 ui/images/logo.png                                 |  Bin 3778 -> 3886 bytes
 ui/images/sprites.png                              |  Bin 182811 -> 188552 bytes
 ui/index.jsp                                       |    2 +
 ui/scripts/accounts.js                             |   32 +-
 ui/scripts/cloudStack.js                           |    5 +-
 ui/scripts/docs.js                                 |   14 +
 ui/scripts/globalSettings.js                       |    8 +-
 ui/scripts/network.js                              |   20 +-
 ui/scripts/regions.js                              |  170 +++
 ui/scripts/system.js                               |  343 +++++-
 ui/scripts/ui-custom/regions.js                    |  118 ++
 ui/scripts/ui/core.js                              |    4 +
 ui/scripts/ui/widgets/multiEdit.js                 |    8 +-
 ui/scripts/vpc.js                                  |    7 +
 ui/scripts/zoneWizard.js                           |  231 ++++-
 usage/pom.xml                                      |    4 +-
 usage/src/com/cloud/usage/UsageManagerImpl.java    |    2 +-
 utils/src/com/cloud/utils/db/Transaction.java      |    4 +-
 .../cloud/utils/db/TransactionContextBuilder.java  |   13 +-
 utils/src/com/cloud/utils/script/Script.java       |    6 +
 .../cloud/hypervisor/vmware/mo/DatacenterMO.java   |    8 +
 .../vmware/mo/DistributedVirtualSwitchMO.java      |   47 +
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |  331 ++++--
 .../hypervisor/vmware/mo/VirtualSwitchType.java    |   37 +-
 .../cloud/hypervisor/vmware/util/VmwareHelper.java |    4 +
 vmware-base/test/com/cloud/vmware/TestVMWare.java  |  245 ++++-
 291 files changed, 9231 insertions(+), 5975 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e653c025/ui/css/cloudstack3.css
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e653c025/ui/scripts/network.js
----------------------------------------------------------------------


Mime
View raw message