You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/12/19 23:04:26 UTC
[2/50] [abbrv] git commit: Merge branch 'master' into ui-plugins
Merge branch 'master' into ui-plugins
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/eae7d43c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/eae7d43c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/eae7d43c
Branch: refs/heads/ui-plugins
Commit: eae7d43c2ca6e9eadec17203f1bc9edf6c24e923
Parents: 9b1c74e 392feac
Author: Brian Federle <br...@citrix.com>
Authored: Wed Dec 19 14:00:28 2012 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Dec 19 14:00:28 2012 -0800
----------------------------------------------------------------------
.gitignore | 2 +
.../com/cloud/agent/api/BackupSnapshotCommand.java | 25 +-
.../CreatePrivateTemplateFromSnapshotCommand.java | 9 +-
.../CreatePrivateTemplateFromVolumeCommand.java | 13 +-
.../agent/api/CreateVolumeFromSnapshotCommand.java | 9 +-
.../agent/api/DeleteSnapshotBackupCommand.java | 8 +
.../agent/api/DeleteTemplateFromS3Command.java | 106 +++
.../agent/api/DownloadSnapshotFromS3Command.java | 61 ++
...oadTemplateFromS3ToSecondaryStorageCommand.java | 66 ++
api/src/com/cloud/agent/api/SnapshotCommand.java | 18 +-
.../cloud/agent/api/UpgradeSnapshotCommand.java | 6 +-
...oadTemplateToS3FromSecondaryStorageCommand.java | 121 +++
.../api/downloadSnapshotFromSwiftCommand.java | 4 +-
.../api/storage/PrimaryStorageDownloadCommand.java | 15 +-
api/src/com/cloud/agent/api/to/S3TO.java | 252 ++++++
api/src/com/cloud/api/ApiConstants.java | 12 +
api/src/com/cloud/api/ResponseGenerator.java | 5 +
api/src/com/cloud/api/commands/AddS3Cmd.java | 218 +++++
api/src/com/cloud/api/commands/ListS3sCmd.java | 112 +++
api/src/com/cloud/api/response/S3Response.java | 209 +++++
api/src/com/cloud/resource/ResourceService.java | 8 +
api/src/com/cloud/storage/S3.java | 51 ++
.../agent/api/test/BackupSnapshotAnswerTest.java | 2 +-
.../agent/api/test/BackupSnapshotCommandTest.java | 6 +-
.../cloud/agent/api/test/SnapshotCommandTest.java | 96 ++-
.../WEB-INF/classes/resources/messages.properties | 13 +-
.../classes/resources/messages_fr_FR.properties | 2 -
.../classes/resources/messages_ja.properties | 2 -
.../classes/resources/messages_pt_BR.properties | 2 -
.../classes/resources/messages_ru_RU.properties | 2 -
.../classes/resources/messages_zh_CN.properties | 2 -
client/tomcatconf/commands.properties.in | 3 +
client/tomcatconf/db-enc.properties.in | 3 -
client/tomcatconf/db.properties.in | 3 -
core/pom.xml | 5 +
.../cloud/agent/api/DirectNetworkUsageCommand.java | 23 +-
.../network/resource/TrafficSentinelResource.java | 39 +-
core/src/com/cloud/storage/S3VO.java | 208 +++++
core/src/com/cloud/storage/SnapshotVO.java | 12 +
core/src/com/cloud/storage/VMTemplateS3VO.java | 203 +++++
.../resource/NfsSecondaryStorageResource.java | 435 +++++++++-
docs/README.txt | 2 +-
docs/en-US/API_Developers_Guide.ent | 21 -
docs/en-US/API_Developers_Guide.xml | 56 --
docs/en-US/Developers_Guide.ent | 21 +
docs/en-US/Developers_Guide.xml | 58 ++
docs/en-US/building-devcloud.xml | 32 +
docs/en-US/building-prerequisites.xml | 66 ++
docs/en-US/building-with-maven-deploy.xml | 39 +
docs/en-US/building-with-maven-steps.xml | 33 +
docs/en-US/building-with-maven.xml | 32 +
docs/en-US/devcloud-usage-mode.xml | 60 ++
docs/en-US/devcloud.xml | 38 +
docs/en-US/developer-introduction.xml | 2 +-
docs/en-US/images/DevCloud-hostonly.png | Bin 0 -> 39311 bytes
docs/en-US/images/DevCloud.png | Bin 0 -> 33529 bytes
docs/en-US/marvin.xml | 32 +
docs/en-US/source-build.xml | 49 ++
docs/en-US/tools.xml | 29 +
docs/publican-devguide.cfg | 2 +-
patches/systemvm/debian/config/etc/sysctl.conf | 2 +-
patches/systemvm/debian/config/root/edithosts.sh | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 125 ++--
.../kvm/storage/KVMStoragePoolManager.java | 87 ++-
.../kvm/storage/LibvirtStorageAdaptor.java | 32 -
.../hypervisor/kvm/storage/StorageAdaptor.java | 4 -
.../xen/resource/CitrixResourceBase.java | 102 +++-
plugins/network-elements/dns-notifier/pom.xml | 50 ++
.../dns-notifier/resources/components-example.xml | 220 +++++
.../cloudstack/network/element/DnsNotifier.java | 143 +++
.../network/guru/NiciraNvpGuestNetworkGuru.java | 8 +-
.../guru/NiciraNvpGuestNetworkGuruTest.java | 343 ++++++++
.../src/com/cloud/network/element/OvsElement.java | 13 +-
plugins/pom.xml | 1 +
pom.xml | 10 +-
scripts/vm/hypervisor/xenserver/s3xen | 297 +++++++
scripts/vm/hypervisor/xenserver/xenserver56/patch | 2 +
.../vm/hypervisor/xenserver/xenserver56fp1/patch | 2 +
scripts/vm/hypervisor/xenserver/xenserver60/patch | 2 +
scripts/vm/network/security_group.py | 8 +-
server/pom.xml | 6 +-
server/src/com/cloud/api/ApiDBUtils.java | 8 +
server/src/com/cloud/api/ApiDispatcher.java | 17 +-
server/src/com/cloud/api/ApiResponseHelper.java | 97 ++-
server/src/com/cloud/api/ApiServer.java | 19 +-
server/src/com/cloud/api/ApiServlet.java | 5 +-
.../cloud/api/commands/AddTrafficMonitorCmd.java | 14 +
server/src/com/cloud/api/doc/ApiXmlDocWriter.java | 5 +
server/src/com/cloud/configuration/Config.java | 6 +-
.../configuration/ConfigurationManagerImpl.java | 15 +
.../configuration/DefaultComponentLibrary.java | 6 +
.../com/cloud/network/NetworkUsageManagerImpl.java | 28 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 8 +-
.../com/cloud/resource/ResourceManagerImpl.java | 17 +
.../src/com/cloud/storage/StorageManagerImpl.java | 21 +-
server/src/com/cloud/storage/dao/S3Dao.java | 29 +
server/src/com/cloud/storage/dao/S3DaoImpl.java | 47 +
.../src/com/cloud/storage/dao/VMTemplateDao.java | 2 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 15 +-
.../src/com/cloud/storage/dao/VMTemplateS3Dao.java | 36 +
.../com/cloud/storage/dao/VMTemplateS3DaoImpl.java | 101 +++
server/src/com/cloud/storage/s3/S3Manager.java | 63 ++
server/src/com/cloud/storage/s3/S3ManagerImpl.java | 669 +++++++++++++++
.../cloud/storage/snapshot/SnapshotManager.java | 2 +
.../storage/snapshot/SnapshotManagerImpl.java | 110 +++-
server/src/com/cloud/template/S3SyncTask.java | 94 ++
.../com/cloud/template/TemplateManagerImpl.java | 90 ++-
server/src/com/cloud/vm/UserVmManagerImpl.java | 8 +-
setup/db/create-schema.sql | 36 +-
setup/db/db/schema-40to410.sql | 58 ++
tools/apidoc/gen_toc.py | 1 +
tools/cli/cloudmonkey/cloudmonkey.py | 3 +-
tools/devcloud/README.md | 102 +++
tools/devcloud/basebuild/Vagrantfile | 51 --
.../basebuild/puppet-devcloudinitial/Modulefile | 8 -
.../basebuild/puppet-devcloudinitial/files/grub | 52 --
.../puppet-devcloudinitial/files/interfaces | 33 -
.../puppet-devcloudinitial/files/network.conf | 1 -
.../puppet-devcloudinitial/files/xen-defaults | 18 -
.../basebuild/puppet-devcloudinitial/files/xend | 188 ----
.../basebuild/puppet-devcloudinitial/init.pp | 18 -
.../puppet-devcloudinitial/manifests/init.pp | 106 ---
tools/devcloud/build_vagrant_basebox.sh | 99 ---
tools/devcloud/devcloudbox/Vagrantfile | 51 --
.../devcloudbox/puppet-devcloud/Modulefile | 8 -
.../puppet-devcloud/files/builddevcloud.sh | 28 -
.../puppet-devcloud/files/configebtables.sh | 21 -
.../puppet-devcloud/files/configlocalstorage.sh | 25 -
.../devcloudbox/puppet-devcloud/files/configvnc.sh | 25 -
.../devcloudbox/puppet-devcloud/files/exports | 18 -
.../puppet-devcloud/files/installmaven.sh | 22 -
.../puppet-devcloud/files/iptables.save | 30 -
.../puppet-devcloud/files/startdevcloud.sh | 23 -
.../puppet-devcloud/files/updatecode.sh | 27 -
tools/devcloud/devcloudbox/puppet-devcloud/init.pp | 18 -
.../devcloudbox/puppet-devcloud/manifests/init.pp | 348 --------
tools/devcloud/devcloudsetup.sh | 151 ----
tools/devcloud/src/.rvmrc | 24 +
tools/devcloud/src/Gemfile | 19 +
tools/devcloud/src/Vagrantfile | 58 ++
tools/devcloud/src/boxit.sh | 21 +
tools/devcloud/src/deps/boxer.sh | 184 ++++
tools/devcloud/src/deps/boxes/basebox-build/.rvmrc | 24 +
.../devcloud/src/deps/boxes/basebox-build/Gemfile | 20 +
.../src/deps/boxes/basebox-build/Vagrantfile | 17 +
.../src/deps/boxes/basebox-build/definition.rb | 59 ++
.../src/deps/boxes/basebox-build/postinstall.sh | 42 +
.../src/deps/boxes/basebox-build/preseed.cfg | 122 +++
tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc | 24 +
tools/devcloud/src/deps/boxes/xenbox-build/Gemfile | 19 +
.../src/deps/boxes/xenbox-build/Vagrantfile | 52 ++
.../boxes/xenbox-build/puppet/manifests/site.pp | 16 +
.../puppet/manifests/vagrant-devcloudinitial.pp | 18 +
.../puppet/modules/devcloudinitial/Modulefile | 8 +
.../puppet/modules/devcloudinitial/files/grub | 52 ++
.../modules/devcloudinitial/files/interfaces | 45 +
.../modules/devcloudinitial/files/iptables.save | 30 +
.../modules/devcloudinitial/files/xen-defaults | 18 +
.../puppet/modules/devcloudinitial/files/xend | 188 ++++
.../modules/devcloudinitial/manifests/init.pp | 119 +++
.../src/puppet/manifests/vagrant-devcloud.pp | 18 +
.../src/puppet/modules/devcloud/Modulefile | 8 +
.../src/puppet/modules/devcloud/files/compare.sh | 22 +
.../modules/devcloud/files/configebtables.sh | 21 +
.../modules/devcloud/files/configlocalstorage.sh | 25 +
.../src/puppet/modules/devcloud/files/configvnc.sh | 25 +
.../src/puppet/modules/devcloud/files/exports | 19 +
.../puppet/modules/devcloud/files/installmaven.sh | 22 +
.../puppet/modules/devcloud/files/startdevcloud.sh | 23 +
.../puppet/modules/devcloud/files/updatecode.sh | 27 +
.../puppet/modules/devcloud/lib/facter/xeninfo.rb | 22 +
.../devcloud/manifests/functions/httpdownload.pp | 37 +
.../src/puppet/modules/devcloud/manifests/init.pp | 255 ++++++
.../puppet/modules/devcloud/manifests/params.pp | 78 ++
.../devcloud/templates/buildcloudstack.sh.erb | 28 +
.../devcloud/templates/startcloudstack.sh.erb | 26 +
tools/devcloud/src/waitforxe.sh | 39 +
tools/devcloud/veewee/definition.rb | 56 --
tools/devcloud/veewee/postinstall.sh | 43 -
tools/devcloud/veewee/preseed.cfg | 122 ---
tools/marvin/marvin/cloudstackConnection.py | 2 +-
tools/marvin/marvin/deployDataCenter.py | 13 +-
tools/marvin/marvin/integration/lib/base.py | 6 +
tools/marvin/marvin/integration/lib/common.py | 13 +-
tools/marvin/marvin/remoteSSHClient.py | 9 +-
ui/css/cloudstack3.css | 41 -
ui/dictionary.jsp | 13 +-
ui/images/bg-what-is-cloudplatform.png | Bin 32250 -> 0 bytes
ui/scripts/cloudStack.js | 55 +-
ui/scripts/installWizard.js | 7 -
ui/scripts/network.js | 20 +-
ui/scripts/sharedFunctions.js | 1 +
ui/scripts/system.js | 247 ++++--
ui/scripts/templates.js | 2 +-
ui/scripts/ui-custom/installWizard.js | 61 +--
ui/scripts/zoneWizard.js | 57 +-
utils/conf/db.properties | 6 +-
utils/pom.xml | 13 +-
utils/src/com/cloud/utils/DateUtil.java | 4 +
utils/src/com/cloud/utils/S3Utils.java | 495 +++++++++++
utils/src/com/cloud/utils/StringUtils.java | 27 +-
utils/src/com/cloud/utils/db/GlobalLock.java | 40 +
utils/src/com/cloud/utils/db/Transaction.java | 3 -
utils/test/com/cloud/utils/StringUtilsTest.java | 106 +++
204 files changed, 8682 insertions(+), 2177 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/eae7d43c/ui/scripts/cloudStack.js
----------------------------------------------------------------------