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/ff71dd05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ff71dd05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ff71dd05 Branch: refs/heads/vpc Commit: ff71dd05250650b97c526311ad64f89a9514fdfb Parents: 827943a 58a9b94 Author: [email protected] <[email protected]> Authored: Thu Jul 26 09:16:07 2012 -0400 Committer: [email protected] <[email protected]> Committed: Thu Jul 26 09:16:07 2012 -0400 ---------------------------------------------------------------------- agent-simulator/db/create-schema-simulator.sql | 28 +- .../scripts/zucchini/zucchini.configuration.sql | 28 +- agent/conf/environment.properties.in | 1 + .../centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 27 +- .../fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 27 +- .../opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in | 49 ++- .../rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 27 +- agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in | 49 ++- .../distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in | 185 ++++--- agent/libexec/agent-runner.in | 88 --- agent/src/com/cloud/agent/AgentShell.java | 39 +- .../agent/resource/computing/KVMHAChecker.java | 2 +- .../com/cloud/api/BaseListTaggedResourcesCmd.java | 26 +- api/src/com/cloud/api/commands/CreateTagsCmd.java | 1 + api/src/com/cloud/api/commands/GetUserCmd.java | 76 +++ api/src/com/cloud/user/AccountService.java | 2 + .../cloud/bridge/service/EC2SoapServiceImpl.java | 431 +++++++++++---- .../service/core/ec2/EC2DescribeInstances.java | 9 + .../service/core/ec2/EC2DescribeSnapshots.java | 9 + .../bridge/service/core/ec2/EC2DescribeTags.java | 34 ++ .../service/core/ec2/EC2DescribeTagsResponse.java | 37 ++ .../service/core/ec2/EC2DescribeVolumes.java | 9 + .../cloud/bridge/service/core/ec2/EC2Engine.java | 217 +++++++- .../cloud/bridge/service/core/ec2/EC2Image.java | 15 +- .../cloud/bridge/service/core/ec2/EC2Instance.java | 12 +- .../service/core/ec2/EC2InstanceFilterSet.java | 45 ++- .../bridge/service/core/ec2/EC2RegisterImage.java | 24 +- .../bridge/service/core/ec2/EC2ResourceTag.java | 64 +++ .../cloud/bridge/service/core/ec2/EC2Snapshot.java | 12 + .../service/core/ec2/EC2SnapshotFilterSet.java | 45 ++- .../bridge/service/core/ec2/EC2TagKeyValue.java | 44 ++ .../bridge/service/core/ec2/EC2TagTypeId.java | 47 ++ .../com/cloud/bridge/service/core/ec2/EC2Tags.java | 44 ++ .../bridge/service/core/ec2/EC2TagsFilterSet.java | 107 ++++ .../cloud/bridge/service/core/ec2/EC2Volume.java | 15 +- .../service/core/ec2/EC2VolumeFilterSet.java | 43 ++- awsapi/src/com/cloud/stack/CloudStackApi.java | 90 +++- .../src/com/cloud/stack/models/ApiConstants.java | 10 + .../cloud/stack/models/CloudStackResourceTag.java | 50 ++ .../com/cloud/stack/models/CloudStackSnapshot.java | 9 + .../com/cloud/stack/models/CloudStackTemplate.java | 10 + .../com/cloud/stack/models/CloudStackUserVm.java | 9 + .../com/cloud/stack/models/CloudStackVolume.java | 10 + build/deploy/production/db/templates-dev.sql | 28 +- .../deploy/production/server/conf/log4j-cloud.xml | 50 ++- build/package.xml | 2 +- .../WEB-INF/classes/resources/messages.properties | 2 +- .../opensuse/SYSCONFDIR/init.d/cloud-management.in | 27 +- .../sles/SYSCONFDIR/init.d/cloud-management.in | 27 +- .../ubuntu/SYSCONFDIR/init.d/cloud-management.in | 27 +- client/tomcatconf/commands.properties.in | 1 + client/tomcatconf/components.xml.in | 4 +- cloud-cli/cloudapis/cloud.py | 2 +- cloud.spec | 2 + daemonize/COPYING | 16 - daemonize/daemonize.c | 351 ------------ debian/changelog | 6 + debian/cloud-agent-deps.install | 2 +- debian/cloud-agent.install | 1 - debian/cloud-usage.install | 1 - debian/control | 32 +- debian/copyright | 26 +- deps/.classpath | 2 +- deps/cloud-libvirt-0.4.5.jar | Bin 68899 -> 0 bytes deps/libvirt-0.4.8.jar | Bin 0 -> 70122 bytes .../systemvm/debian/config/root/savepassword.sh | 29 +- .../hypervisor/vmware/resource/VmwareResource.java | 6 +- .../api/commands/AddExternalLoadBalancerCmd.java | 31 +- .../cloud/api/commands/AddF5LoadBalancerCmd.java | 31 +- .../api/commands/ConfigureF5LoadBalancerCmd.java | 29 +- .../commands/DeleteExternalLoadBalancerCmd.java | 29 +- .../api/commands/DeleteF5LoadBalancerCmd.java | 29 +- .../api/commands/ListExternalLoadBalancersCmd.java | 29 +- .../commands/ListF5LoadBalancerNetworksCmd.java | 29 +- .../cloud/api/commands/ListF5LoadBalancersCmd.java | 29 +- .../api/commands/AddNetscalerLoadBalancerCmd.java | 17 +- .../ConfigureNetscalerLoadBalancerCmd.java | 16 +- .../commands/DeleteNetscalerLoadBalancerCmd.java | 17 +- .../ListNetscalerLoadBalancerNetworksCmd.java | 16 +- .../commands/ListNetscalerLoadBalancersCmd.java | 16 +- .../allocator/RandomStoragePoolAllocator.java | 17 +- .../cloud/server/auth/LDAPUserAuthenticator.java | 17 +- .../cloud/server/auth/MD5UserAuthenticator.java | 27 +- .../server/auth/PlainTextUserAuthenticator.java | 17 +- project_admin/templates/committerAnnounce.txt | 5 + scripts/vm/hypervisor/kvm/kvmheartbeat.sh | 12 +- server/src/com/cloud/api/ApiResponseHelper.java | 4 +- server/src/com/cloud/configuration/Config.java | 2 +- .../src/com/cloud/network/NetworkManagerImpl.java | 1 + .../com/cloud/network/guru/ControlNetworkGuru.java | 9 + .../cloud/network/guru/PodBasedNetworkGuru.java | 4 + .../com/cloud/network/guru/PublicNetworkGuru.java | 4 + .../network/security/dao/SecurityGroupDaoImpl.java | 14 + .../src/com/cloud/server/ManagementServerImpl.java | 38 +- .../src/com/cloud/storage/StorageManagerImpl.java | 21 +- .../src/com/cloud/storage/dao/VMTemplateDao.java | 1 + .../com/cloud/storage/dao/VMTemplateDaoImpl.java | 74 ++- .../cloud/storage/upload/UploadMonitorImpl.java | 18 +- .../com/cloud/tags/TaggedResourceManagerImpl.java | 12 +- server/src/com/cloud/user/AccountManagerImpl.java | 5 + server/src/com/cloud/user/dao/UserAccountDao.java | 1 + .../src/com/cloud/user/dao/UserAccountDaoImpl.java | 17 + .../com/cloud/user/MockAccountManagerImpl.java | 9 + tools/devcloud/veewee/README | 5 + tools/devcloud/veewee/definition.rb | 56 ++ tools/devcloud/veewee/preseed.cfg | 122 ++++ ui/css/cloudstack3.css | 208 +++++++ ui/images/sprites.png | Bin 178569 -> 178788 bytes ui/index.jsp | 22 +- ui/scripts/instances.js | 2 + ui/scripts/network.js | 131 ++--- ui/scripts/projects.js | 4 + ui/scripts/sharedFunctions.js | 82 +++ ui/scripts/storage.js | 5 + ui/scripts/system.js | 14 +- ui/scripts/templates.js | 82 +++- ui/scripts/ui-custom/instanceWizard.js | 93 ++-- ui/scripts/ui-custom/projects.js | 9 +- ui/scripts/ui-custom/zoneWizard.js | 5 + ui/scripts/ui/core.js | 37 ++- ui/scripts/ui/dialog.js | 124 +++-- ui/scripts/ui/widgets/cloudBrowser.js | 3 + ui/scripts/ui/widgets/detailView.js | 50 ++- ui/scripts/ui/widgets/multiEdit.js | 16 +- ui/scripts/ui/widgets/notifications.js | 2 +- ui/scripts/ui/widgets/tagger.js | 201 +++++++ .../distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in | 28 +- usage/libexec/usage-runner.in | 37 -- usage/src/com/cloud/usage/UsageServer.java | 19 +- wscript_build | 57 ++- 130 files changed, 3378 insertions(+), 1433 deletions(-) ----------------------------------------------------------------------
