You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/10 03:31:07 UTC
[9/18] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/47ea9f25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/47ea9f25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/47ea9f25
Branch: refs/heads/vpc
Commit: 47ea9f254c402978e7eec38834d1f7b211b4ecfa
Parents: 32fef61 ca231fe
Author: David Nalley <da...@gnsa.us>
Authored: Fri Jul 6 17:28:38 2012 -0400
Committer: David Nalley <da...@gnsa.us>
Committed: Fri Jul 6 17:28:38 2012 -0400
----------------------------------------------------------------------
.../com/cloud/api/BaseListDomainResourcesCmd.java | 9 +-
.../api/BaseListProjectAndAccountResourcesCmd.java | 2 +-
.../com/cloud/api/BaseListTaggedResourcesCmd.java | 47 +
api/src/com/cloud/api/ResponseGenerator.java | 3 +-
api/src/com/cloud/api/commands/DeleteTagsCmd.java | 3 +-
.../cloud/api/commands/ListFirewallRulesCmd.java | 5 +-
api/src/com/cloud/api/commands/ListIsosCmd.java | 4 +-
.../api/commands/ListLoadBalancerRulesCmd.java | 5 +-
.../com/cloud/api/commands/ListNetworksCmd.java | 4 +-
.../api/commands/ListPortForwardingRulesCmd.java | 14 +-
.../api/commands/ListPublicIpAddressesCmd.java | 13 +-
.../cloud/api/commands/ListSecurityGroupsCmd.java | 30 +-
.../com/cloud/api/commands/ListSnapshotsCmd.java | 13 +-
api/src/com/cloud/api/commands/ListTagsCmd.java | 2 +-
.../com/cloud/api/commands/ListTemplatesCmd.java | 5 +-
api/src/com/cloud/api/commands/ListVMsCmd.java | 4 +-
api/src/com/cloud/api/commands/ListVolumesCmd.java | 13 +-
.../com/cloud/api/response/FirewallResponse.java | 12 +-
.../cloud/api/response/FirewallRuleResponse.java | 11 +-
.../com/cloud/api/response/IPAddressResponse.java | 10 +-
.../cloud/api/response/LoadBalancerResponse.java | 11 +-
.../com/cloud/api/response/NetworkResponse.java | 7 +
.../cloud/api/response/SecurityGroupResponse.java | 9 +-
.../com/cloud/api/response/SnapshotResponse.java | 10 +-
.../com/cloud/api/response/TemplateResponse.java | 8 +
api/src/com/cloud/api/response/UserVmResponse.java | 9 +-
api/src/com/cloud/api/response/VolumeResponse.java | 12 +-
api/src/com/cloud/server/ResourceTag.java | 5 +
.../com/cloud/server/TaggedResourceService.java | 2 +
.../WEB-INF/classes/resources/messages.properties | 6 +-
.../src/com/cloud/netapp/dao/VolumeDaoImpl.java | 1 +
scripts/vm/hypervisor/xenserver/xcpserver/patch | 3 +
server/src/com/cloud/api/ApiDBUtils.java | 6 +-
server/src/com/cloud/api/ApiResponseHelper.java | 171 +++-
.../src/com/cloud/network/NetworkManagerImpl.java | 49 +-
.../cloud/network/dao/FirewallRulesDaoImpl.java | 25 +-
.../com/cloud/network/dao/IPAddressDaoImpl.java | 17 +
.../com/cloud/network/dao/LoadBalancerDaoImpl.java | 2 +-
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 17 +-
.../network/firewall/FirewallManagerImpl.java | 30 +
.../network/lb/LoadBalancingRulesManagerImpl.java | 29 +
.../com/cloud/network/rules/RulesManagerImpl.java | 30 +-
.../network/security/SecurityGroupManagerImpl.java | 29 +
.../network/security/dao/SecurityGroupDaoImpl.java | 40 +-
.../src/com/cloud/projects/dao/ProjectDaoImpl.java | 2 -
.../src/com/cloud/server/ManagementServerImpl.java | 48 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 28 +
.../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 19 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 35 +-
.../src/com/cloud/storage/dao/VolumeDaoImpl.java | 18 +
.../storage/snapshot/SnapshotManagerImpl.java | 30 +
server/src/com/cloud/tags/ResourceTagVO.java | 12 +-
.../com/cloud/tags/TaggedResourceManagerImpl.java | 38 +-
server/src/com/cloud/tags/dao/ResourceTagDao.java | 20 +
.../com/cloud/tags/dao/ResourceTagsDaoImpl.java | 40 +-
server/src/com/cloud/vm/UserVmManager.java | 3 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 33 +-
server/src/com/cloud/vm/dao/UserVmDao.java | 1 +
server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 1008 ++++++++-------
server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 18 +
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 2 +-
setup/db/create-schema.sql | 5 +-
ui/css/cloudstack3.css | 2 +-
63 files changed, 1445 insertions(+), 654 deletions(-)
----------------------------------------------------------------------