Updated Branches: refs/heads/4.0 b04ac1d3b -> 0c617c299
Merged over files from master Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0c617c29 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0c617c29 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0c617c29 Branch: refs/heads/4.0 Commit: 0c617c29958da396cf6aac62ee6ad08f17d46dc7 Parents: b04ac1d 51cc301 Author: Alex Huang <[email protected]> Authored: Tue Sep 4 15:12:22 2012 -0700 Committer: Alex Huang <[email protected]> Committed: Tue Sep 4 15:12:22 2012 -0700 ---------------------------------------------------------------------- .gitignore | 1 + LICENSE | 4291 ++++++- LICENSE_BIN | 545 - NOTICE | 668 +- NOTICE_BIN | 32 - README.md | 16 +- agent/pom.xml | 66 + agent/src/com/cloud/agent/VmmAgentShell.java | 526 + api/pom.xml | 45 + .../com/cloud/agent/api/NetworkUsageCommand.java | 42 +- api/src/com/cloud/api/ApiConstants.java | 1 + .../api/commands/UpdateVpnCustomerGatewayCmd.java | 2 +- .../com/cloud/api/response/ExceptionResponse.java | 43 +- .../com/cloud/api/response/IPAddressResponse.java | 7 + api/src/com/cloud/api/response/UserVmResponse.java | 7 + api/src/com/cloud/storage/GuestOsCategory.java | 2 + awsapi-setup/setup/cloudstack-aws-api-register | 2 +- awsapi/.classpath | 23 +- awsapi/conf/cloud-bridge.properties | 4 +- awsapi/conf/ec2-service.properties | 2 +- awsapi/conf/hibernate.cfg.xml | 51 - awsapi/pom.xml | 182 + .../bridge/auth/ec2/AuthenticationHandler.java | 21 +- .../bridge/auth/s3/AuthenticationHandler.java | 10 +- .../bridge/lifecycle/ServiceEngineLifecycle.java | 4 +- .../src/com/cloud/bridge/model/BucketPolicyVO.java | 59 + .../cloud/bridge/model/CloudStackAccountVO.java | 34 + .../bridge/model/CloudStackConfigurationVO.java | 30 + .../bridge/model/CloudStackServiceOfferingVO.java | 51 + awsapi/src/com/cloud/bridge/model/MHost.hbm.xml | 55 - awsapi/src/com/cloud/bridge/model/MHost.java | 111 - .../src/com/cloud/bridge/model/MHostMount.hbm.xml | 46 - awsapi/src/com/cloud/bridge/model/MHostMount.java | 92 - .../src/com/cloud/bridge/model/MHostMountVO.java | 136 + awsapi/src/com/cloud/bridge/model/MHostVO.java | 137 + .../com/cloud/bridge/model/MultiPartPartsVO.java | 108 + .../com/cloud/bridge/model/MultiPartUploadsVO.java | 94 + .../com/cloud/bridge/model/MultipartMetaVO.java | 59 + .../com/cloud/bridge/model/OfferingBundleVO.java | 46 + awsapi/src/com/cloud/bridge/model/SAcl.hbm.xml | 54 - awsapi/src/com/cloud/bridge/model/SAcl.java | 106 +- awsapi/src/com/cloud/bridge/model/SAclVO.java | 254 + awsapi/src/com/cloud/bridge/model/SBucket.hbm.xml | 56 - awsapi/src/com/cloud/bridge/model/SBucket.java | 11 +- awsapi/src/com/cloud/bridge/model/SBucketVO.java | 169 + awsapi/src/com/cloud/bridge/model/SHost.hbm.xml | 60 - awsapi/src/com/cloud/bridge/model/SHost.java | 18 +- awsapi/src/com/cloud/bridge/model/SHostVO.java | 152 + awsapi/src/com/cloud/bridge/model/SMeta.hbm.xml | 41 - awsapi/src/com/cloud/bridge/model/SMeta.java | 94 - awsapi/src/com/cloud/bridge/model/SMetaVO.java | 112 + awsapi/src/com/cloud/bridge/model/SObject.hbm.xml | 59 - awsapi/src/com/cloud/bridge/model/SObject.java | 206 - .../src/com/cloud/bridge/model/SObjectItem.hbm.xml | 62 - awsapi/src/com/cloud/bridge/model/SObjectItem.java | 149 - .../src/com/cloud/bridge/model/SObjectItemVO.java | 191 + awsapi/src/com/cloud/bridge/model/SObjectVO.java | 242 + .../com/cloud/bridge/model/UserCredentials.hbm.xml | 38 - .../com/cloud/bridge/model/UserCredentials.java | 95 - .../com/cloud/bridge/model/UserCredentialsVO.java | 117 + awsapi/src/com/cloud/bridge/persist/EntityDao.java | 118 - .../cloud/bridge/persist/GMTDateTimeUserType.java | 102 - .../com/cloud/bridge/persist/PersistContext.java | 359 - .../com/cloud/bridge/persist/PersistException.java | 36 - .../cloud/bridge/persist/dao/BucketPolicyDao.java | 157 +- .../bridge/persist/dao/BucketPolicyDaoImpl.java | 72 + .../bridge/persist/dao/CloudStackAccountDao.java | 36 +- .../persist/dao/CloudStackAccountDaoImpl.java | 39 + .../persist/dao/CloudStackConfigurationDao.java | 41 +- .../dao/CloudStackConfigurationDaoImpl.java | 45 + .../persist/dao/CloudStackSvcOfferingDao.java | 39 +- .../persist/dao/CloudStackSvcOfferingDaoImpl.java | 75 + .../src/com/cloud/bridge/persist/dao/MHostDao.java | 34 +- .../com/cloud/bridge/persist/dao/MHostDaoImpl.java | 61 + .../cloud/bridge/persist/dao/MHostMountDao.java | 33 +- .../bridge/persist/dao/MHostMountDaoImpl.java | 48 + .../bridge/persist/dao/MultiPartPartsDao.java | 18 + .../bridge/persist/dao/MultiPartPartsDaoImpl.java | 101 + .../bridge/persist/dao/MultiPartUploadsDao.java | 21 + .../persist/dao/MultiPartUploadsDaoImpl.java | 108 + .../cloud/bridge/persist/dao/MultipartLoadDao.java | 428 +- .../cloud/bridge/persist/dao/MultipartMetaDao.java | 12 + .../bridge/persist/dao/MultipartMetaDaoImpl.java | 34 + .../com/cloud/bridge/persist/dao/OfferingDao.java | 167 +- .../cloud/bridge/persist/dao/OfferingDaoImpl.java | 135 + .../src/com/cloud/bridge/persist/dao/SAclDao.java | 75 +- .../com/cloud/bridge/persist/dao/SAclDaoImpl.java | 127 + .../com/cloud/bridge/persist/dao/SBucketDao.java | 37 +- .../cloud/bridge/persist/dao/SBucketDaoImpl.java | 72 + .../src/com/cloud/bridge/persist/dao/SHostDao.java | 39 +- .../com/cloud/bridge/persist/dao/SHostDaoImpl.java | 67 + .../src/com/cloud/bridge/persist/dao/SMetaDao.java | 54 +- .../com/cloud/bridge/persist/dao/SMetaDaoImpl.java | 88 + .../com/cloud/bridge/persist/dao/SObjectDao.java | 77 +- .../cloud/bridge/persist/dao/SObjectDaoImpl.java | 119 + .../cloud/bridge/persist/dao/SObjectItemDao.java | 36 +- .../bridge/persist/dao/SObjectItemDaoImpl.java | 71 + .../bridge/persist/dao/UserCredentialsDao.java | 167 +- .../bridge/persist/dao/UserCredentialsDaoImpl.java | 73 + .../com/cloud/bridge/service/EC2MainServlet.java | 20 +- .../com/cloud/bridge/service/EC2RestServlet.java | 69 +- .../cloud/bridge/service/EC2SoapServiceImpl.java | 8 +- .../com/cloud/bridge/service/S3RestServlet.java | 49 +- .../service/controller/s3/S3BucketAction.java | 870 +- .../service/controller/s3/S3ObjectAction.java | 18 +- .../service/controller/s3/ServiceProvider.java | 151 +- .../cloud/bridge/service/core/ec2/EC2Engine.java | 39 +- .../cloud/bridge/service/core/ec2/EC2Instance.java | 10 + .../com/cloud/bridge/service/core/s3/S3Engine.java | 812 +- .../com/cloud/bridge/service/core/s3/S3Grant.java | 5 +- .../service/exception/EC2ServiceException.java | 1 + .../com/cloud/bridge/util/CloudSessionFactory.java | 106 - .../bridge/util/CloudStackSessionFactory.java | 106 - awsapi/src/com/cloud/bridge/util/QueryHelper.java | 85 - .../cloud/stack/models/CloudStackAccount.hbm.xml | 34 - .../stack/models/CloudStackConfiguration.hbm.xml | 37 - .../stack/models/CloudStackServiceOffering.hbm.xml | 34 - .../com/cloud/stack/models/CloudStackUserVm.java | 9 + build/build-aws-api.xml | 58 +- build/build-cloud-plugins.xml | 4 - build/build-cloud.properties | 1 + build/build-cloud.xml | 12 +- build/build-usage.xml | 12 +- build/deploy/production/db/templates-dev.sql | 32 +- build/developer.xml | 26 +- build/package.xml | 16 +- .../WEB-INF/classes/resources/messages.properties | 96 +- .../classes/resources/messages_es.properties | 883 -- .../classes/resources/messages_ja.properties | 124 +- .../classes/resources/messages_zh_CN.properties | 2912 ++-- client/WEB-INF/web.xml | 6 - client/cloudstack-ui.launch | 14 + client/pom.xml | 249 + client/tomcatconf/components.xml.in | 29 +- client/tomcatconf/server-nonssl.xml | 91 +- client/tomcatconf/server-ssl.xml.in | 110 +- client/tomcatconf/server.xml.in | 91 +- cloud.spec | 230 +- console-proxy/pom.xml | 174 + .../com/cloud/consoleproxy/AjaxFIFOImageCache.java | 39 +- .../src/com/cloud/consoleproxy/ConsoleProxy.java | 4 +- .../consoleproxy/ConsoleProxyAjaxImageHandler.java | 85 +- console-proxy/systemvm-descriptor.xml | 94 + core/pom.xml | 63 + .../virtualnetwork/VirtualRoutingResource.java | 141 +- debian/changelog | 6 + debian/cloud-agent.conffiles | 2 + debian/cloud-client.conffiles | 3 + debian/cloud-deps.install | 1 - debian/control | 2 +- deps/XenServerJava/BSD | 26 + deps/XenServerJava/GPL-2 | 339 - deps/XenServerJava/LICENSE.Apache-2.0.txt | 402 +- deps/XenServerJava/LICENSE.txt | 53 +- deps/XenServerJava/README.txt | 94 +- .../com/xensource/xenapi/APIVersion.java | 83 - deps/XenServerJava/com/xensource/xenapi/Auth.java | 95 - deps/XenServerJava/com/xensource/xenapi/Blob.java | 384 - deps/XenServerJava/com/xensource/xenapi/Bond.java | 376 - .../com/xensource/xenapi/Connection.java | 368 - .../com/xensource/xenapi/Console.java | 397 - .../com/xensource/xenapi/Crashdump.java | 336 - .../com/xensource/xenapi/DataSource.java | 142 - deps/XenServerJava/com/xensource/xenapi/Event.java | 242 - deps/XenServerJava/com/xensource/xenapi/Host.java | 2752 ---- .../com/xensource/xenapi/HostCpu.java | 514 - .../com/xensource/xenapi/HostCrashdump.java | 395 - .../com/xensource/xenapi/HostMetrics.java | 351 - .../com/xensource/xenapi/HostPatch.java | 530 - .../com/xensource/xenapi/Marshalling.java | 59 - .../com/xensource/xenapi/Message.java | 298 - .../com/xensource/xenapi/Network.java | 710 - deps/XenServerJava/com/xensource/xenapi/PBD.java | 520 - deps/XenServerJava/com/xensource/xenapi/PIF.java | 1214 -- .../com/xensource/xenapi/PIFMetrics.java | 511 - deps/XenServerJava/com/xensource/xenapi/Pool.java | 2277 --- .../com/xensource/xenapi/PoolPatch.java | 605 - deps/XenServerJava/com/xensource/xenapi/Role.java | 342 - deps/XenServerJava/com/xensource/xenapi/SM.java | 506 - deps/XenServerJava/com/xensource/xenapi/SR.java | 1460 -- .../XenServerJava/com/xensource/xenapi/Secret.java | 295 - .../com/xensource/xenapi/Session.java | 653 - .../com/xensource/xenapi/Subject.java | 374 - deps/XenServerJava/com/xensource/xenapi/Task.java | 666 - .../XenServerJava/com/xensource/xenapi/Tunnel.java | 452 - deps/XenServerJava/com/xensource/xenapi/Types.java |11056 -------------- deps/XenServerJava/com/xensource/xenapi/User.java | 362 - deps/XenServerJava/com/xensource/xenapi/VBD.java | 1139 -- .../com/xensource/xenapi/VBDMetrics.java | 327 - deps/XenServerJava/com/xensource/xenapi/VDI.java | 1730 --- deps/XenServerJava/com/xensource/xenapi/VIF.java | 825 -- .../com/xensource/xenapi/VIFMetrics.java | 327 - deps/XenServerJava/com/xensource/xenapi/VLAN.java | 399 - deps/XenServerJava/com/xensource/xenapi/VM.java | 4253 ------ .../com/xensource/xenapi/VMGuestMetrics.java | 465 - .../com/xensource/xenapi/VMMetrics.java | 488 - deps/XenServerJava/com/xensource/xenapi/VMPP.java | 1136 -- deps/XenServerJava/com/xensource/xenapi/VTPM.java | 268 - .../com/xensource/xenapi/XenAPIObject.java | 18 - deps/XenServerJava/pom.xml | 43 + .../src/com/xensource/xenapi/APIVersion.java | 100 + .../src/com/xensource/xenapi/Auth.java | 112 + .../src/com/xensource/xenapi/Blob.java | 401 + .../src/com/xensource/xenapi/Bond.java | 393 + .../src/com/xensource/xenapi/Connection.java | 385 + .../src/com/xensource/xenapi/Console.java | 414 + .../src/com/xensource/xenapi/Crashdump.java | 353 + .../src/com/xensource/xenapi/DataSource.java | 159 + .../src/com/xensource/xenapi/Event.java | 258 + .../src/com/xensource/xenapi/Host.java | 2769 ++++ .../src/com/xensource/xenapi/HostCpu.java | 531 + .../src/com/xensource/xenapi/HostCrashdump.java | 412 + .../src/com/xensource/xenapi/HostMetrics.java | 368 + .../src/com/xensource/xenapi/HostPatch.java | 547 + .../src/com/xensource/xenapi/Marshalling.java | 76 + .../src/com/xensource/xenapi/Message.java | 315 + .../src/com/xensource/xenapi/Network.java | 727 + .../src/com/xensource/xenapi/PBD.java | 537 + .../src/com/xensource/xenapi/PIF.java | 1231 ++ .../src/com/xensource/xenapi/PIFMetrics.java | 528 + .../src/com/xensource/xenapi/Pool.java | 2294 +++ .../src/com/xensource/xenapi/PoolPatch.java | 622 + .../src/com/xensource/xenapi/Role.java | 359 + .../XenServerJava/src/com/xensource/xenapi/SM.java | 523 + .../XenServerJava/src/com/xensource/xenapi/SR.java | 1477 ++ .../src/com/xensource/xenapi/Secret.java | 312 + .../src/com/xensource/xenapi/Session.java | 670 + .../src/com/xensource/xenapi/Subject.java | 391 + .../src/com/xensource/xenapi/Task.java | 683 + .../src/com/xensource/xenapi/Tunnel.java | 469 + .../src/com/xensource/xenapi/Types.java |11096 +++++++++++++++ .../src/com/xensource/xenapi/User.java | 379 + .../src/com/xensource/xenapi/VBD.java | 1156 ++ .../src/com/xensource/xenapi/VBDMetrics.java | 344 + .../src/com/xensource/xenapi/VDI.java | 1815 +++ .../src/com/xensource/xenapi/VIF.java | 842 ++ .../src/com/xensource/xenapi/VIFMetrics.java | 344 + .../src/com/xensource/xenapi/VLAN.java | 416 + .../XenServerJava/src/com/xensource/xenapi/VM.java | 4270 ++++++ .../src/com/xensource/xenapi/VMGuestMetrics.java | 482 + .../src/com/xensource/xenapi/VMMetrics.java | 505 + .../src/com/xensource/xenapi/VMPP.java | 1153 ++ .../src/com/xensource/xenapi/VTPM.java | 285 + .../src/com/xensource/xenapi/XenAPIObject.java | 35 + deps/awsapi-lib/XmlSchema-1.4.3.jar | Bin 143145 -> 0 bytes deps/awsapi-lib/antlr-2.7.6.jar | Bin 443432 -> 0 bytes deps/awsapi-lib/apache-log4j-extras-1.0.jar | Bin 153863 -> 0 bytes deps/awsapi-lib/axiom-api-1.2.8.jar | Bin 245780 -> 0 bytes deps/awsapi-lib/axiom-impl-1.2.8.jar | Bin 131352 -> 0 bytes deps/awsapi-lib/axis2-1.5.1.jar | Bin 2342330 -> 0 bytes deps/awsapi-lib/axis2-adb-1.5.1.jar | Bin 777098 -> 0 bytes deps/awsapi-lib/axis2-ant-plugin-1.5.1.jar | Bin 16740 -> 0 bytes deps/awsapi-lib/axis2-jaxbri-1.5.1.jar | Bin 25500 -> 0 bytes deps/awsapi-lib/axis2-jaxws-1.5.1.jar | Bin 643786 -> 0 bytes deps/awsapi-lib/axis2-jibx-1.5.1.jar | Bin 35407 -> 0 bytes deps/awsapi-lib/axis2-json-1.5.1.jar | Bin 16898 -> 0 bytes deps/awsapi-lib/axis2-kernel-1.5.1.jar | Bin 997666 -> 0 bytes deps/awsapi-lib/axis2-transport-http-1.5.1.jar | Bin 145208 -> 0 bytes deps/awsapi-lib/axis2-transport-local-1.5.1.jar | Bin 10840 -> 0 bytes deps/awsapi-lib/c3p0-0.9.1.2.jar | Bin 610790 -> 0 bytes deps/awsapi-lib/cloud-gson.jar | Bin 177245 -> 0 bytes deps/awsapi-lib/commons-codec-1.4.jar | Bin 58160 -> 0 bytes deps/awsapi-lib/commons-collections-3.1.jar | Bin 559366 -> 0 bytes deps/awsapi-lib/commons-fileupload-1.2.jar | Bin 53082 -> 0 bytes deps/awsapi-lib/commons-httpclient-3.1.jar | Bin 305001 -> 0 bytes deps/awsapi-lib/commons-io-1.4.jar | Bin 109043 -> 0 bytes deps/awsapi-lib/commons-logging-1.1.1.jar | Bin 60686 -> 0 bytes deps/awsapi-lib/dom4j-1.6.1.jar | Bin 313898 -> 0 bytes deps/awsapi-lib/hibernate3.jar | Bin 3894821 -> 0 bytes deps/awsapi-lib/httpcore-4.0.jar | Bin 172914 -> 0 bytes deps/awsapi-lib/javassist-3.9.0.GA.jar | Bin 597476 -> 0 bytes deps/awsapi-lib/jaxb-api-2.1.jar | Bin 89967 -> 0 bytes deps/awsapi-lib/jaxb-impl-2.1.7.jar | Bin 854901 -> 0 bytes deps/awsapi-lib/jaxb-xjc-2.1.7.jar | Bin 3126580 -> 0 bytes deps/awsapi-lib/jsch-0.1.42.jar | Bin 185746 -> 0 bytes deps/awsapi-lib/json_simple-1.1.jar | Bin 16046 -> 0 bytes deps/awsapi-lib/jta-1.1.jar | Bin 10899 -> 0 bytes deps/awsapi-lib/junit-4.8.1.jar | Bin 237047 -> 0 bytes deps/awsapi-lib/log4j-1.2.15.jar | Bin 391834 -> 0 bytes deps/awsapi-lib/mail-1.4.jar | Bin 388826 -> 0 bytes deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar | Bin 709922 -> 0 bytes deps/awsapi-lib/neethi-2.0.4.jar | Bin 32900 -> 0 bytes deps/awsapi-lib/slf4j-api-1.5.11.jar | Bin 23671 -> 0 bytes deps/awsapi-lib/slf4j-jdk14-1.5.11.jar | Bin 8831 -> 0 bytes deps/awsapi-lib/woden-api-1.0M8.jar | Bin 145544 -> 0 bytes deps/awsapi-lib/woden-impl-dom-1.0M8.jar | Bin 222478 -> 0 bytes deps/awsapi-lib/xercesImpl.jar | Bin 1212965 -> 0 bytes deps/awsapi-lib/xml-apis.jar | Bin 195119 -> 0 bytes deps/cloud-axis.jar | Bin 1599570 -> 0 bytes deps/cloud-backport-util-concurrent-3.0.jar | Bin 327810 -> 0 bytes deps/cloud-bcprov-jdk16-1.45.jar | Bin 1719483 -> 0 bytes deps/cloud-cglib.jar | Bin 332756 -> 0 bytes deps/cloud-commons-codec-1.5.jar | Bin 73098 -> 0 bytes deps/cloud-commons-collections-3.2.1.jar | Bin 575389 -> 0 bytes deps/cloud-commons-configuration-1.8.jar | Bin 354491 -> 0 bytes deps/cloud-commons-dbcp-1.4.jar | Bin 160519 -> 0 bytes deps/cloud-commons-discovery.jar | Bin 71442 -> 0 bytes deps/cloud-commons-httpclient-3.1.jar | Bin 305001 -> 0 bytes deps/cloud-commons-lang-2.6.jar | Bin 284220 -> 0 bytes deps/cloud-commons-logging-1.1.1.jar | Bin 60841 -> 0 bytes deps/cloud-commons-pool-1.5.6.jar | Bin 100472 -> 0 bytes deps/cloud-ehcache.jar | Bin 263854 -> 0 bytes deps/cloud-ejb-api-3.0.jar | Bin 32941 -> 0 bytes deps/cloud-email.jar | Bin 434812 -> 0 bytes deps/cloud-google-gson-1.7.1.jar | Bin 173590 -> 0 bytes deps/cloud-httpcore-4.0.jar | Bin 172914 -> 0 bytes deps/cloud-iControl.jar | Bin 2284200 -> 0 bytes deps/cloud-jasypt-1.8.jar | Bin 178961 -> 0 bytes deps/cloud-javax.persistence-2.0.0.jar | Bin 134684 -> 0 bytes deps/cloud-jnetpcap.jar | Bin 540571 -> 0 bytes deps/cloud-jsch-0.1.42.jar | Bin 185746 -> 0 bytes deps/cloud-jstl-1.2.jar | Bin 414240 -> 0 bytes deps/cloud-junit.jar | Bin 237047 -> 0 bytes deps/cloud-log4j-extras.jar | Bin 346729 -> 0 bytes deps/cloud-log4j.jar | Bin 481534 -> 0 bytes deps/cloud-manageontap.jar | Bin 55444 -> 0 bytes deps/cloud-mysql-connector-java-5.1.7-bin.jar | Bin 709922 -> 0 bytes deps/cloud-netscaler-sdx.jar | Bin 138839 -> 0 bytes deps/cloud-netscaler.jar | Bin 1881606 -> 0 bytes deps/cloud-servlet-api.jar | Bin 83787 -> 0 bytes deps/cloud-trilead-ssh2-build213.jar | Bin 252914 -> 0 bytes deps/cloud-ws-commons-util-1.0.2.jar | Bin 34407 -> 0 bytes deps/cloud-wsdl4j-1.6.2.jar | Bin 148429 -> 0 bytes deps/cloud-wsdl4j.jar | Bin 126771 -> 0 bytes deps/cloud-xenserver-5.6.100-1.jar | Bin 426631 -> 0 bytes deps/cloud-xmlrpc-client-3.1.3.jar | Bin 58573 -> 0 bytes deps/cloud-xmlrpc-common-3.1.3.jar | Bin 109131 -> 0 bytes deps/cloud-xstream-1.3.1.jar | Bin 431406 -> 0 bytes deps/install-non-oss.sh | 10 + deps/jetty-6.1.26.jar | Bin 539912 -> 0 bytes deps/jetty-util-6.1.26.jar | Bin 177131 -> 0 bytes deps/libvirt-0.4.8.jar | Bin 70122 -> 0 bytes deps/pom.xml | 203 + deps/vmware-apputils.jar | Bin 40057 -> 0 bytes deps/vmware-lib-jaxrpc.jar | Bin 31191 -> 0 bytes deps/vmware-vim.jar | Bin 2645679 -> 0 bytes deps/vmware-vim25.jar | Bin 5666804 -> 0 bytes docs/en-US/about-physical-networks.xml | 1 + docs/en-US/advanced-zone-configuration.xml | 156 +- docs/en-US/cloud-infrastructure-concepts.xml | 1 + docs/en-US/hypervisor-host-install-agent.xml | 34 + docs/en-US/hypervisor-host-install-firewall.xml | 59 + docs/en-US/hypervisor-host-install-flow.xml | 5 +- docs/en-US/hypervisor-host-install-libvirt.xml | 25 +- docs/en-US/hypervisor-host-install-network.xml | 149 + docs/en-US/hypervisor-host-install-overview.xml | 3 +- docs/en-US/hypervisor-host-install-prepare-os.xml | 12 +- .../hypervisor-host-install-security-policies.xml | 19 +- docs/en-US/initialize-and-test.xml | 27 +- .../install-database-on-management-server-node.xml | 98 - docs/en-US/install-database-on-separate-node.xml | 105 - .../install-management-server-multi-nodes.xml | 74 - docs/en-US/install-management-server.xml | 58 - docs/en-US/installation-complete.xml | 39 - docs/en-US/management-server-install-client.xml | 40 + docs/en-US/management-server-install-complete.xml | 39 + .../management-server-install-db-external.xml | 105 + docs/en-US/management-server-install-db-local.xml | 98 + docs/en-US/management-server-install-flow.xml | 18 +- .../en-US/management-server-install-multi-node.xml | 74 + .../en-US/management-server-install-nfs-shares.xml | 38 + docs/en-US/management-server-install-overview.xml | 45 + .../en-US/management-server-install-prepare-os.xml | 54 + docs/en-US/management-server-install-systemvm.xml | 56 + .../management-server-installation-overview.xml | 45 - .../en-US/management_server_multi_node_install.xml | 30 - docs/en-US/management_server_overview.xml | 53 - docs/en-US/prepare-nfs-shares.xml | 38 - docs/en-US/prepare-os.xml | 110 - docs/en-US/prepare-system-vm-template.xml | 56 - docs/runbook/publican.cfg | 7 + patches/cloudpatch-descriptor.xml | 43 + patches/pom.xml | 97 + .../debian/config/etc/init.d/cloud-early-config | 4 +- .../systemvm/debian/config/etc/profile.d/cloud.sh | 29 +- .../debian/config/opt/cloud/bin/cloud-nic.sh | 14 +- .../config/opt/cloud/bin/get_template_version.sh | 28 +- .../debian/config/opt/cloud/bin/ipassoc.sh | 32 +- .../debian/config/opt/cloud/bin/ipsectunnel.sh | 34 +- .../debian/config/opt/cloud/bin/netusage.sh | 30 +- .../debian/config/opt/cloud/bin/patchsystemvm.sh | 30 +- .../debian/config/opt/cloud/bin/serve_password.sh | 31 +- .../debian/config/opt/cloud/bin/vpc_acl.sh | 28 +- .../debian/config/opt/cloud/bin/vpc_func.sh | 28 +- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 61 +- .../debian/config/opt/cloud/bin/vpc_ipassoc.sh | 30 +- .../config/opt/cloud/bin/vpc_loadbalancer.sh | 28 +- .../debian/config/opt/cloud/bin/vpc_netusage.sh | 101 +- .../config/opt/cloud/bin/vpc_portforwarding.sh | 28 +- .../config/opt/cloud/bin/vpc_privateGateway.sh | 28 +- .../debian/config/opt/cloud/bin/vpc_snat.sh | 28 +- .../debian/config/opt/cloud/bin/vpc_staticnat.sh | 28 +- .../debian/config/opt/cloud/bin/vpc_staticroute.sh | 28 +- .../systemvm/debian/config/root/bumpup_priority.sh | 28 +- .../systemvm/debian/config/root/clearUsageRules.sh | 31 +- patches/systemvm/debian/config/root/edithosts.sh | 29 +- patches/systemvm/debian/config/root/firewall.sh | 30 +- .../systemvm/debian/config/root/firewall_rule.sh | 28 +- patches/systemvm/debian/config/root/func.sh | 28 +- .../systemvm/debian/config/root/loadbalancer.sh | 30 +- patches/systemvm/debian/config/root/reconfigLB.sh | 30 +- .../config/root/redundant_router/check_bumpup.sh | 28 +- .../config/root/redundant_router/disable_pubip.sh | 28 +- .../root/redundant_router/primary-backup.sh.templ | 26 +- patches/systemvm/debian/config/root/userdata.py | 31 +- patches/systemvm/debian/config/root/userdata.sh | 30 +- .../debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh | 30 +- .../systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh | 30 +- patches/systemvm/debian/xe/xe-daemon | 26 +- patches/systemvm/debian/xe/xe-linux-distribution | 26 +- patches/systemvm/debian/xe/xe-update-guest-attrs | 26 +- .../user-concentrated-pod/pom.xml | 30 + .../cloud/deploy/UserConcentratedPodPlanner.java | 28 +- .../deployment-planners/user-dispersing/pom.xml | 30 + .../com/cloud/deploy/UserDispersingPlanner.java | 28 +- plugins/file-systems/netapp/pom.xml | 37 + plugins/host-allocators/random/pom.xml | 30 + .../manager/allocator/impl/RandomAllocator.java | 28 +- plugins/hypervisors/kvm/pom.xml | 42 + .../hypervisor/kvm/resource/KVMGuestOsMapper.java | 1 + .../kvm/resource/LibvirtComputingResource.java | 281 +- plugins/hypervisors/ovm/pom.xml | 30 + plugins/hypervisors/vmware/pom.xml | 37 + .../vmware/src/com/cloud/ha/VmwareFencer.java | 28 +- .../src/com/cloud/ha/VmwareInvestigator.java | 28 +- .../src/com/cloud/hypervisor/guru/VMwareGuru.java | 28 +- .../cloud/hypervisor/vmware/VmwareCleanupMaid.java | 28 +- .../hypervisor/vmware/VmwareServerDiscoverer.java | 28 +- .../vmware/manager/VmwareHostService.java | 28 +- .../hypervisor/vmware/manager/VmwareManager.java | 28 +- .../vmware/manager/VmwareManagerImpl.java | 28 +- .../vmware/manager/VmwareStorageManager.java | 28 +- .../vmware/manager/VmwareStorageManagerImpl.java | 28 +- .../vmware/manager/VmwareStorageMount.java | 28 +- .../vmware/resource/VmwareContextFactory.java | 28 +- .../hypervisor/vmware/resource/VmwareResource.java | 180 +- .../network/CiscoNexusVSMDeviceManagerImpl.java | 28 +- .../cloud/network/dao/CiscoNexusVSMDeviceDao.java | 28 +- .../network/dao/CiscoNexusVSMDeviceDaoImpl.java | 30 +- .../resource/PremiumSecondaryStorageResource.java | 28 +- .../VmwareSecondaryStorageContextFactory.java | 28 +- .../VmwareSecondaryStorageResourceHandler.java | 28 +- plugins/hypervisors/xen/pom.xml | 37 + .../xen/src/com/cloud/ha/XenServerFencer.java | 28 +- .../src/com/cloud/hypervisor/XenServerGuru.java | 28 +- .../xen/discoverer/XcpServerDiscoverer.java | 37 +- .../hypervisor/xen/resource/CitrixHelper.java | 28 +- .../xen/resource/CitrixResourceBase.java | 33 +- .../hypervisor/xen/resource/XcpServerResource.java | 28 +- .../xen/resource/XenServer56FP1Resource.java | 28 +- .../xen/resource/XenServer56Resource.java | 78 +- .../xen/resource/XenServer56SP2Resource.java | 28 +- .../xen/resource/XenServer600Resource.java | 28 +- .../xen/resource/XenServer602Resource.java | 28 +- .../xen/resource/XenServerConnectionPool.java | 30 +- .../hypervisor/xen/resource/XenServerPoolVms.java | 28 +- .../network-elements/elastic-loadbalancer/pom.xml | 30 + .../network/lb/ElasticLoadBalancerManagerImpl.java | 8 - plugins/network-elements/f5/pom.xml | 42 + .../element/F5ExternalLoadBalancerElement.java | 28 +- .../F5ExternalLoadBalancerElementService.java | 28 +- .../cloud/network/resource/F5BigIpResource.java | 30 +- plugins/network-elements/juniper-srx/pom.xml | 42 + .../cloud/api/commands/AddExternalFirewallCmd.java | 28 +- .../com/cloud/api/commands/AddSrxFirewallCmd.java | 28 +- .../api/commands/ConfigureSrxFirewallCmd.java | 28 +- .../api/commands/DeleteExternalFirewallCmd.java | 28 +- .../cloud/api/commands/DeleteSrxFirewallCmd.java | 28 +- .../api/commands/ListExternalFirewallsCmd.java | 28 +- .../api/commands/ListSrxFirewallNetworksCmd.java | 28 +- .../cloud/api/commands/ListSrxFirewallsCmd.java | 28 +- .../element/JuniperSRXExternalFirewallElement.java | 30 +- .../element/JuniperSRXFirewallElementService.java | 28 +- .../cloud/network/resource/JuniperSrxResource.java | 30 +- plugins/network-elements/midokura-midonet/pom.xml | 30 + plugins/network-elements/netscaler/pom.xml | 42 + .../src/com/cloud/network/NetScalerPodVO.java | 27 +- .../src/com/cloud/network/dao/NetScalerPodDao.java | 29 +- .../com/cloud/network/dao/NetScalerPodDaoImpl.java | 27 +- .../cloud/network/element/NetscalerElement.java | 30 +- .../NetscalerLoadBalancerElementService.java | 28 +- .../cloud/network/resource/NetscalerResource.java | 30 +- plugins/network-elements/nicira-nvp/pom.xml | 30 + .../agent/api/FindLogicalSwitchPortAnswer.java | 36 + .../agent/api/FindLogicalSwitchPortCommand.java | 44 + .../agent/api/UpdateLogicalSwitchPortAnswer.java | 36 + .../agent/api/UpdateLogicalSwitchPortCommand.java | 65 + .../cloud/network/element/NiciraNvpElement.java | 26 +- .../src/com/cloud/network/nicira/NiciraNvpApi.java | 20 +- .../cloud/network/resource/NiciraNvpResource.java | 56 + plugins/network-elements/ovs/pom.xml | 30 + plugins/pom.xml | 126 + plugins/storage-allocators/random/pom.xml | 30 + plugins/user-authenticators/ldap/pom.xml | 30 + plugins/user-authenticators/md5/pom.xml | 30 + plugins/user-authenticators/plain-text/pom.xml | 30 + pom.xml | 231 + python/bindir/cloud-external-ipallocator.py | 26 +- python/bindir/cloud-setup-baremetal | 28 +- python/incubation/cloud-web-ipallocator.py | 26 +- python/lib/cloud_utils.py | 26 +- python/lib/cloudutils/__init__.py | 26 +- python/lib/cloudutils/cloudException.py | 26 +- python/lib/cloudutils/configFileOps.py | 26 +- python/lib/cloudutils/db.py | 26 +- python/lib/cloudutils/globalEnv.py | 26 +- python/lib/cloudutils/networkConfig.py | 26 +- python/lib/cloudutils/serviceConfig.py | 28 +- python/lib/cloudutils/serviceConfigServer.py | 26 +- python/lib/cloudutils/syscfg.py | 26 +- python/lib/cloudutils/utilities.py | 26 +- scripts/network/domr/s2s_vpn.sh | 29 +- scripts/vm/hypervisor/xenserver/vmops | 13 +- scripts/vm/network/security_group.py | 74 +- server/pom.xml | 73 + server/src/com/cloud/agent/VmmAgentShell.java | 526 - server/src/com/cloud/api/ApiDBUtils.java | 17 + server/src/com/cloud/api/ApiResponseHelper.java | 16 +- .../cloud/api/response/ApiResponseSerializer.java | 2 +- .../cloud/capacity/StorageCapacityListener.java | 7 - .../src/com/cloud/cluster/ClusterManagerImpl.java | 3 +- server/src/com/cloud/configuration/Config.java | 3 +- .../AgentBasedConsoleProxyManager.java | 8 - .../consoleproxy/ConsoleProxyManagerImpl.java | 9 - .../com/cloud/ha/HighAvailabilityManagerImpl.java | 3 +- server/src/com/cloud/maint/Version.java | 8 + server/src/com/cloud/network/NetworkManager.java | 10 +- .../src/com/cloud/network/NetworkManagerImpl.java | 83 +- .../src/com/cloud/network/PhysicalNetworkVO.java | 3 +- .../cloud/network/Site2SiteCustomerGatewayVO.java | 16 + .../cloud/network/Site2SiteVpnConnectionVO.java | 16 + .../com/cloud/network/Site2SiteVpnGatewayVO.java | 16 + .../network/dao/Site2SiteCustomerGatewayDao.java | 18 +- .../dao/Site2SiteCustomerGatewayDaoImpl.java | 19 +- .../network/dao/Site2SiteVpnConnectionDao.java | 16 + .../network/dao/Site2SiteVpnConnectionDaoImpl.java | 16 + .../cloud/network/dao/Site2SiteVpnGatewayDao.java | 16 + .../network/dao/Site2SiteVpnGatewayDaoImpl.java | 16 + .../network/firewall/FirewallManagerImpl.java | 5 + .../com/cloud/network/guru/GuestNetworkGuru.java | 19 +- .../router/VirtualNetworkApplianceManagerImpl.java | 6802 +++++----- .../VpcVirtualNetworkApplianceManagerImpl.java | 67 +- server/src/com/cloud/network/vpc/VpcManager.java | 7 + .../src/com/cloud/network/vpc/VpcManagerImpl.java | 20 +- .../com/cloud/network/vpn/Site2SiteVpnManager.java | 16 + .../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 35 +- .../com/cloud/resource/ResourceManagerImpl.java | 15 +- .../src/com/cloud/server/ManagementServerImpl.java | 2 +- .../src/com/cloud/servlet/ConsoleProxyServlet.java | 5 +- server/src/com/cloud/storage/StorageManager.java | 2 +- .../src/com/cloud/storage/StorageManagerImpl.java | 14 +- .../secondary/SecondaryStorageManagerImpl.java | 16 +- .../storage/snapshot/SnapshotManagerImpl.java | 2 +- .../cloud/storage/upload/UploadMonitorImpl.java | 27 +- .../cloud/upgrade/DatabaseIntegrityChecker.java | 4 + .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 3 + .../src/com/cloud/upgrade/dao/Upgrade2214to30.java | 329 +- .../src/com/cloud/upgrade/dao/Upgrade302to40.java | 507 +- .../src/com/cloud/upgrade/dao/Upgrade30xBase.java | 314 + server/src/com/cloud/user/dao/SSHKeyPairDao.java | 2 + .../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java | 9 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 65 +- server/src/com/cloud/vm/VirtualMachineGuru.java | 3 - .../com/cloud/vm/VirtualMachineManagerImpl.java | 10 +- server/src/com/cloud/vm/dao/NicDao.java | 2 + server/src/com/cloud/vm/dao/NicDaoImpl.java | 10 + server/src/com/cloud/vm/dao/UserVmData.java | 9 + .../src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 2 +- server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 1 + .../com/cloud/network/MockNetworkManagerImpl.java | 16 +- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 8 - .../cloud/vpc/MockConfigurationManagerImpl.java | 28 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 37 +- .../cloud/vpc/MockResourceLimitManagerImpl.java | 28 +- .../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java | 28 +- server/test/com/cloud/vpc/MockVpcManagerImpl.java | 38 +- server/test/com/cloud/vpc/VpcApiUnitTest.java | 28 +- .../cloud/vpc/dao/MockConfigurationDaoImpl.java | 28 +- .../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 28 +- .../cloud/vpc/dao/MockNetworkOfferingDaoImpl.java | 28 +- .../dao/MockNetworkOfferingServiceMapDaoImpl.java | 28 +- .../vpc/dao/MockNetworkServiceMapDaoImpl.java | 28 +- server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java | 28 +- .../com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java | 28 +- .../vpc/dao/MockVpcOfferingServiceMapDaoImpl.java | 28 +- .../cloud/vpc/dao/MockVpcVirtualRouterElement.java | 28 +- server/test/resources/cleanup.sql | 28 +- server/test/resources/fake.sql | 28 +- setup/apidoc/build-apidoc.sh | 16 +- setup/db/create-schema.sql | 28 +- setup/db/db/schema-302to40.sql | 6 + setup/db/deploy-db-dev.sh | 4 + setup/db/templates.sql | 4 +- test/conf/templates.sql | 30 +- tools/ant/apache-ant-1.7.1/bin/runant.py | 29 +- tools/build/addcopyright.py | 290 - tools/build/build_asf.sh | 105 + tools/devcloud/build_vagrant_basebox.sh | 112 +- tools/devcloud/veewee/definition.rb | 4 +- tools/gcc/gcc.sh | 30 +- tools/migration/XenAPI.py | 42 +- tools/migration/share_all_lus.sh | 29 +- tools/migration/upgrade.py | 28 +- .../tooljars/cloud-selenium-java-client-driver.jar | Bin 16175099 -> 0 bytes tools/waf/javadir.py | 28 +- tools/waf/mkisofs.py | 30 +- tools/waf/tar.py | 28 +- tools/waf/tomcat.py | 30 +- tools/waf/usermgmt.py | 30 +- tools/whisker/descriptor.xml | 2854 ++++ ui/css/cloudstack3.css | 31 +- ui/dictionary.jsp | 1390 ++ ui/index.jsp | 1325 +-- ui/scripts/accounts.js | 2 + ui/scripts/configuration.js | 26 +- ui/scripts/network.js | 363 +- ui/scripts/projects.js | 2 +- ui/scripts/sharedFunctions.js | 4 + ui/scripts/system.js | 32 +- ui/scripts/ui-custom/instanceWizard.js | 28 +- ui/scripts/ui-custom/vpc.js | 46 +- ui/scripts/ui/dialog.js | 9 + ui/scripts/ui/widgets/tagger.js | 6 +- ui/scripts/vpc.js | 154 +- ui/scripts/zoneWizard.js | 60 +- usage/pom.xml | 40 + utils/pom.xml | 151 + utils/src/com/cloud/utils/db/Transaction.java | 38 +- utils/src/com/cloud/utils/script/Script.java | 9 + version-info.in | 1 - vmware-base/pom.xml | 70 + .../src/com/cloud/hypervisor/vmware/mo/HostMO.java | 60 +- wscript | 28 +- wscript_build | 52 +- 634 files changed, 70933 insertions(+), 58249 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0c617c29/docs/en-US/hypervisor-host-install-flow.xml ---------------------------------------------------------------------- diff --cc docs/en-US/hypervisor-host-install-flow.xml index 5badfde,74668c8..35145fd --- a/docs/en-US/hypervisor-host-install-flow.xml +++ b/docs/en-US/hypervisor-host-install-flow.xml @@@ -28,4 -28,7 +28,7 @@@ <xi:include href="hypervisor-host-install-prepare-os.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="hypervisor-host-install-libvirt.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="hypervisor-host-install-security-policies.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - </section> + <xi:include href="hypervisor-host-install-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="hypervisor-host-install-firewall.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="hypervisor-host-install-agent.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> -</section> ++</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0c617c29/docs/en-US/hypervisor-host-install-libvirt.xml ---------------------------------------------------------------------- diff --cc docs/en-US/hypervisor-host-install-libvirt.xml index 239c4d7,15cfde2..3caf2bb --- a/docs/en-US/hypervisor-host-install-libvirt.xml +++ b/docs/en-US/hypervisor-host-install-libvirt.xml @@@ -55,5 -55,12 +55,12 @@@ <para>to (just add -l)</para> <programlisting>exec /usr/sbin/libvirtd -d -l</programlisting> </listitem> + <listitem> + <para>Restart libvirt</para> + <para>In RHEL or CentOS:</para> + <programlisting language="Bash">service libvirtd restart</programlisting> + <para>In Ubuntu:</para> + <programlisting language="Bash">service libvirt-bin restart</programlisting> + </listitem> </orderedlist> --</section> ++</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0c617c29/docs/en-US/hypervisor-host-install-overview.xml ---------------------------------------------------------------------- diff --cc docs/en-US/hypervisor-host-install-overview.xml index 54ca55f,187abea..faba416 --- a/docs/en-US/hypervisor-host-install-overview.xml +++ b/docs/en-US/hypervisor-host-install-overview.xml @@@ -33,4 -34,4 +34,4 @@@ <listitem><para>Configure Security Policies (AppArmor and SELinux)</para></listitem> <listitem><para>Install and configure the Agent</para></listitem> </orderedlist> --</section> ++</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0c617c29/docs/en-US/hypervisor-host-install-prepare-os.xml ---------------------------------------------------------------------- diff --cc docs/en-US/hypervisor-host-install-prepare-os.xml index 2884cd1,e2e32e7..4845075 --- a/docs/en-US/hypervisor-host-install-prepare-os.xml +++ b/docs/en-US/hypervisor-host-install-prepare-os.xml @@@ -50,4 -50,4 +50,4 @@@ </listitem> <listitem><para>Repeat all of these steps on every hypervisor host.</para></listitem> </orderedlist> --</section> ++</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0c617c29/docs/en-US/hypervisor-host-install-security-policies.xml ---------------------------------------------------------------------- diff --cc docs/en-US/hypervisor-host-install-security-policies.xml index 4ba748e,5fd6925..290d2d0 --- a/docs/en-US/hypervisor-host-install-security-policies.xml +++ b/docs/en-US/hypervisor-host-install-security-policies.xml @@@ -66,4 -67,4 +67,4 @@@ </orderedlist> </listitem> </orderedlist> --</section> ++</section>
