Merge branch 'master' into events-framework
Conflicts:
client/tomcatconf/components.xml.in
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ffd55c4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ffd55c4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ffd55c4e
Branch: refs/heads/events-framework
Commit: ffd55c4ee124815c44f927f8cb930af422d4d854
Parents: 2dd40c2 25c0d84
Author: Murali Reddy <[email protected]>
Authored: Fri Jan 25 14:26:41 2013 +0530
Committer: Murali Reddy <[email protected]>
Committed: Fri Jan 25 14:26:41 2013 +0530
----------------------------------------------------------------------
agent/conf/agent.properties | 11 +
api/src/com/cloud/dao/EntityManager.java | 9 +
.../com/cloud/exception/RequestLimitException.java | 43 +
api/src/com/cloud/network/NetworkModel.java | 2 +
api/src/com/cloud/resource/ResourceService.java | 5 +-
api/src/com/cloud/server/ManagementService.java | 37 +-
.../cloud/storage/snapshot/SnapshotService.java | 2 +-
api/src/org/apache/cloudstack/acl/APIChecker.java | 3 +-
.../org/apache/cloudstack/acl/APILimitChecker.java | 30 +
.../api/BaseListAccountResourcesCmd.java | 2 +-
.../api/command/admin/host/ListHostsCmd.java | 9 +-
.../admin/network/CreateNetworkOfferingCmd.java | 4 +-
.../api/command/admin/swift/ListSwiftsCmd.java | 10 +-
.../api/command/user/iso/AttachIsoCmd.java | 2 +-
.../api/command/user/iso/DetachIsoCmd.java | 2 +-
.../user/offering/ListDiskOfferingsCmd.java | 13 +-
.../user/offering/ListServiceOfferingsCmd.java | 17 +-
.../user/snapshot/ListSnapshotPoliciesCmd.java | 7 +-
.../api/command/user/template/CopyTemplateCmd.java | 2 +-
.../command/user/template/DeleteTemplateCmd.java | 4 +-
.../command/user/template/ExtractTemplateCmd.java | 4 +-
.../api/command/user/vpc/ListVPCsCmd.java | 17 -
.../api/command/user/zone/ListZonesByCmd.java | 13 +-
.../cloudstack/api/response/ZoneResponse.java | 6 +-
.../org/apache/cloudstack/query/QueryService.java | 12 +
.../WEB-INF/classes/resources/messages.properties | 4 +-
client/pom.xml | 5 +
client/tomcatconf/commands.properties.in | 5 +
client/tomcatconf/components.xml.in | 7 +-
.../network/resource/TrafficSentinelResource.java | 2 +-
docs/en-US/host-add-xenserver-kvm-ovm.xml | 5 +
...hypervisor-host-install-network-openvswitch.xml | 116 +
docs/en-US/hypervisor-host-install-network.xml | 3 +-
docs/en-US/hypervisor-kvm-install-flow.xml | 3 +-
docs/en-US/hypervisor-kvm-requirements.xml | 7 +-
docs/en-US/offerings.xml | 32 +-
docs/en-US/plugin-niciranvp-features.xml | 8 +-
docs/en-US/plugin-niciranvp-preparations.xml | 4 +-
docs/en-US/plugin-niciranvp-ui.xml | 26 +
docs/en-US/plugin-niciranvp-usage.xml | 1 +
docs/en-US/sys-offering-sysvm.xml | 75 +
.../config/opt/cloud/bin/checkbatchs2svpn.sh | 25 +
plugins/api/discovery/pom.xml | 64 +-
.../api/response/ApiDiscoveryResponse.java | 16 +
.../discovery/ApiDiscoveryServiceImpl.java | 14 +-
.../cloudstack/discovery/ApiDiscoveryTest.java | 87 +
plugins/api/rate-limit/pom.xml | 51 +
.../command/admin/ratelimit/ResetApiLimitCmd.java | 99 +
.../api/command/user/ratelimit/GetApiLimitCmd.java | 89 +
.../cloudstack/api/response/ApiLimitResponse.java | 82 +
.../cloudstack/ratelimit/ApiRateLimitService.java | 37 +
.../ratelimit/ApiRateLimitServiceImpl.java | 196 ++
.../cloudstack/ratelimit/EhcacheLimitStore.java | 99 +
.../apache/cloudstack/ratelimit/LimitStore.java | 51 +
.../apache/cloudstack/ratelimit/StoreEntry.java | 33 +
.../cloudstack/ratelimit/StoreEntryImpl.java | 64 +
.../cloudstack/ratelimit/ApiRateLimitTest.java | 226 ++
.../cloudstack/ratelimit/integration/APITest.java | 211 ++
.../ratelimit/integration/LoginResponse.java | 142 ++
.../integration/RateLimitIntegrationTest.java | 214 ++
.../hypervisor/kvm/resource/BridgeVifDriver.java | 20 +-
.../kvm/resource/LibvirtComputingResource.java | 204 ++-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 37 +
.../hypervisor/kvm/resource/OvsVifDriver.java | 189 ++
.../kvm/storage/KVMStoragePoolManager.java | 4 +
.../hypervisor/vmware/resource/VmwareResource.java | 2 +-
.../cloud/network/resource/F5BigIpResource.java | 2 +-
.../cloud/network/resource/JuniperSrxResource.java | 2 +-
.../cloud/network/resource/NetscalerResource.java | 2 +-
.../cloud/network/resource/NiciraNvpResource.java | 2 +-
plugins/pom.xml | 1 +
pom.xml | 37 +-
scripts/vm/hypervisor/kvm/rundomrpre.sh | 2 +-
server/pom.xml | 1 +
.../com/cloud/agent/manager/AgentManagerImpl.java | 8 +-
server/src/com/cloud/api/ApiDBUtils.java | 41 +
server/src/com/cloud/api/ApiDispatcher.java | 19 +-
server/src/com/cloud/api/ApiResponseHelper.java | 145 +-
server/src/com/cloud/api/ApiServer.java | 17 +
server/src/com/cloud/api/ApiServlet.java | 6 +-
server/src/com/cloud/api/doc/ApiXmlDocWriter.java | 20 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 469 ++++-
.../com/cloud/api/query/ViewResponseHelper.java | 30 +
.../com/cloud/api/query/dao/DataCenterJoinDao.java | 30 +
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 109 +
.../cloud/api/query/dao/DiskOfferingJoinDao.java | 29 +
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 101 +
.../api/query/dao/ServiceOfferingJoinDao.java | 30 +
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 91 +
.../com/cloud/api/query/vo/DataCenterJoinVO.java | 284 +++
.../com/cloud/api/query/vo/DiskOfferingJoinVO.java | 233 ++
.../cloud/api/query/vo/ServiceOfferingJoinVO.java | 311 +++
.../cloud/baremetal/ExternalDhcpResourceBase.java | 2 +-
.../com/cloud/baremetal/PxeServerResourceBase.java | 2 +-
server/src/com/cloud/configuration/Config.java | 1 -
.../configuration/DefaultComponentLibrary.java | 6 +
server/src/com/cloud/dao/EntityManagerImpl.java | 7 +
server/src/com/cloud/network/NetworkModelImpl.java | 6 +
.../src/com/cloud/network/NetworkServiceImpl.java | 24 -
.../cloud/resource/DummyHostServerResource.java | 2 +-
.../com/cloud/resource/ResourceManagerImpl.java | 6 +-
.../com/cloud/server/ConfigurationServerImpl.java | 3 +-
.../src/com/cloud/server/ManagementServerImpl.java | 555 +----
.../com/cloud/storage/dao/SnapshotPolicyDao.java | 3 +
.../cloud/storage/dao/SnapshotPolicyDaoImpl.java | 30 +-
.../storage/snapshot/SnapshotManagerImpl.java | 96 +-
.../src/com/cloud/storage/swift/SwiftManager.java | 3 +-
.../com/cloud/storage/swift/SwiftManagerImpl.java | 7 +-
server/test/com/cloud/api/APITest.java | 39 +-
server/test/com/cloud/api/ListPerfTest.java | 9 +-
.../com/cloud/network/MockNetworkModelImpl.java | 9 +
.../cloud/resource/MockResourceManagerImpl.java | 2 +-
setup/db/create-schema-view.sql | 1845 +++++++++------
setup/db/db/schema-40to410.sql | 1842 +++++++++------
tools/cli/cloudmonkey/cloudmonkey.py | 42 +-
tools/cli/cloudmonkey/common.py | 4 +-
tools/cli/setup.py | 2 +-
tools/devcloud-kvm/pom.xml | 10 +-
tools/devcloud/devcloud.sql | 2 +-
tools/devcloud/devcloud_internal-mgt.cfg | 121 +
tools/devcloud/pom.xml | 10 +-
ui/css/cloudstack3.css | 12 +
ui/index.jsp | 4 +-
ui/scripts/configuration.js | 14 +-
ui/scripts/instanceWizard.js | 152 +-
ui/scripts/projects.js | 2 +-
ui/scripts/ui-custom/instanceWizard.js | 31 +-
utils/src/com/cloud/utils/IteratorUtil.java | 10 +
utils/src/com/cloud/utils/ReflectUtil.java | 48 +-
utils/src/com/cloud/utils/db/GenericDao.java | 3 +
utils/src/com/cloud/utils/db/GenericDaoBase.java | 8 +
.../utils/exception/CSExceptionErrorCode.java | 1 +
utils/src/com/cloud/utils/script/Script.java | 90 +-
133 files changed, 7258 insertions(+), 2654 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ffd55c4e/client/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ffd55c4e/client/tomcatconf/components.xml.in
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ffd55c4e/plugins/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ffd55c4e/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ffd55c4e/server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ffd55c4e/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ffd55c4e/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ffd55c4e/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------
