Updated Branches: refs/heads/4.0 03df2fa9d -> 90bf6c494
Pulled the latest 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/90bf6c49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/90bf6c49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/90bf6c49 Branch: refs/heads/4.0 Commit: 90bf6c49419b091e57420a6865c8f76b7f938f04 Parents: 03df2fa 0442917 Author: Alex Huang <[email protected]> Authored: Mon Sep 10 13:55:34 2012 -0700 Committer: Alex Huang <[email protected]> Committed: Mon Sep 10 13:55:34 2012 -0700 ---------------------------------------------------------------------- .gitignore | 4 + LICENSE | 4 +- NOTICE | 367 ++-- agent/bindir/mycloud-setup-agent | 153 -- agent/doc/README-iscsi.txt | 247 --- agent/doc/README.txt | 211 -- .../ConsoleProxyAuthenticationResult.java | 128 +- awsapi/axis2.war | Bin 18714716 -> 0 bytes awsapi/conf/CloudStack.cfg.xml | 58 - awsapi/deploy-cloud-bridge.sh | 2 +- .../docs/AmazonEC2/EC2-local-deploy-using-ant.html | 2 +- awsapi/modules/axis2-adb-1.6.2.jar | Bin 688884 -> 0 bytes awsapi/modules/axis2-adb-codegen-1.6.2.jar | Bin 180677 -> 0 bytes awsapi/modules/axis2-ant-plugin-1.6.2.jar | Bin 18284 -> 0 bytes awsapi/modules/axis2-clustering-1.6.2.jar | Bin 107281 -> 0 bytes awsapi/modules/axis2-codegen-1.6.2.jar | Bin 254405 -> 0 bytes awsapi/modules/axis2-corba-1.6.2.jar | Bin 147181 -> 0 bytes awsapi/modules/axis2-fastinfoset-1.6.2.jar | Bin 16437 -> 0 bytes awsapi/modules/axis2-java2wsdl-1.6.2.jar | Bin 27749 -> 0 bytes awsapi/modules/axis2-jaxbri-1.6.2.jar | Bin 28700 -> 0 bytes awsapi/modules/axis2-jaxws-1.6.2.jar | Bin 743899 -> 0 bytes awsapi/modules/axis2-jibx-1.6.2.jar | Bin 35742 -> 0 bytes awsapi/modules/axis2-json-1.6.2.jar | Bin 19191 -> 0 bytes awsapi/modules/axis2-kernel-1.6.2.jar | Bin 1045467 -> 0 bytes awsapi/modules/axis2-metadata-1.6.2.jar | Bin 432494 -> 0 bytes awsapi/modules/axis2-mtompolicy-1.6.2.jar | Bin 13946 -> 0 bytes awsapi/modules/axis2-saaj-1.6.2.jar | Bin 90445 -> 0 bytes awsapi/modules/axis2-soapmonitor-servlet-1.6.2.jar | Bin 33756 -> 0 bytes awsapi/modules/axis2-spring-1.6.2.jar | Bin 11466 -> 0 bytes awsapi/modules/axis2-transport-http-1.6.2.jar | Bin 152926 -> 0 bytes awsapi/modules/axis2-transport-local-1.6.2.jar | Bin 16117 -> 0 bytes awsapi/modules/axis2-xmlbeans-1.6.2.jar | Bin 27446 -> 0 bytes awsapi/modules/rahas-1.5.mar | Bin 3039 -> 0 bytes awsapi/modules/rampart-1.5.mar | Bin 2947 -> 0 bytes awsapi/pom.xml | 162 ++- .../src/com/cloud/bridge/model/BucketPolicyVO.java | 16 + .../cloud/bridge/model/CloudStackAccountVO.java | 16 + .../bridge/model/CloudStackConfigurationVO.java | 16 + .../bridge/model/CloudStackServiceOfferingVO.java | 16 + .../com/cloud/bridge/model/MultiPartPartsVO.java | 16 + .../com/cloud/bridge/model/MultiPartUploadsVO.java | 16 + .../com/cloud/bridge/model/MultipartMetaVO.java | 16 + .../com/cloud/bridge/model/OfferingBundleVO.java | 16 + .../cloud/bridge/persist/dao/BucketPolicyDao.java | 16 + .../bridge/persist/dao/CloudStackAccountDao.java | 16 + .../persist/dao/CloudStackAccountDaoImpl.java | 16 + .../persist/dao/CloudStackConfigurationDao.java | 16 + .../dao/CloudStackConfigurationDaoImpl.java | 16 + .../persist/dao/CloudStackSvcOfferingDao.java | 16 + .../src/com/cloud/bridge/persist/dao/MHostDao.java | 16 + .../cloud/bridge/persist/dao/MHostMountDao.java | 16 + .../bridge/persist/dao/MultiPartPartsDao.java | 16 + .../bridge/persist/dao/MultiPartPartsDaoImpl.java | 16 + .../bridge/persist/dao/MultiPartUploadsDao.java | 16 + .../persist/dao/MultiPartUploadsDaoImpl.java | 16 + .../cloud/bridge/persist/dao/MultipartMetaDao.java | 16 + .../bridge/persist/dao/MultipartMetaDaoImpl.java | 16 + .../com/cloud/bridge/persist/dao/OfferingDao.java | 16 + .../src/com/cloud/bridge/persist/dao/SAclDao.java | 16 + .../com/cloud/bridge/persist/dao/SBucketDao.java | 16 + .../src/com/cloud/bridge/persist/dao/SHostDao.java | 16 + .../src/com/cloud/bridge/persist/dao/SMetaDao.java | 16 + .../com/cloud/bridge/persist/dao/SObjectDao.java | 16 + .../cloud/bridge/persist/dao/SObjectItemDao.java | 16 + .../bridge/persist/dao/UserCredentialsDao.java | 16 + build/build-aws-api.xml | 4 +- build/build-cloud.xml | 14 +- client/cloudstack-ui.launch | 18 + cloud.spec | 15 +- console-proxy/.classpath | 50 +- console-proxy/.project | 82 +- console-proxy/conf.dom0/agent.properties.in | 92 +- console-proxy/conf.dom0/consoleproxy.properties.in | 46 +- console-proxy/conf/agent.properties | 38 +- console-proxy/conf/consoleproxy.properties | 46 +- console-proxy/css/ajaxviewer.css | 288 ++-- console-proxy/js/ajaxviewer.js | 1214 ++++++------ console-proxy/js/handler.js | 106 +- console-proxy/scripts/run.bat | 36 +- .../com/cloud/consoleproxy/AjaxFIFOImageCache.java | 88 +- .../consoleproxy/AuthenticationException.java | 32 +- .../consoleproxy/ConsoleProxyAjaxHandler.java | 752 ++++---- .../consoleproxy/ConsoleProxyAjaxImageHandler.java | 246 ++-- .../ConsoleProxyAuthenticationResult.java | 130 +- .../ConsoleProxyBaseServerFactoryImpl.java | 50 +- .../consoleproxy/ConsoleProxyClientListener.java | 18 +- .../cloud/consoleproxy/ConsoleProxyCmdHandler.java | 106 +- .../ConsoleProxyHttpHandlerHelper.java | 116 +- .../consoleproxy/ConsoleProxyLoggerFactory.java | 140 +- .../cloud/consoleproxy/ConsoleProxyMonitor.java | 226 +- .../consoleproxy/ConsoleProxyResourceHandler.java | 328 ++-- .../ConsoleProxySecureServerFactoryImpl.java | 214 +- .../consoleproxy/ConsoleProxyServerFactory.java | 14 +- .../consoleproxy/ConsoleProxyThumbnailHandler.java | 386 ++-- .../src/com/cloud/consoleproxy/InputEventType.java | 84 +- .../cloud/consoleproxy/util/ITileScanListener.java | 18 +- .../com/cloud/consoleproxy/util/ImageHelper.java | 32 +- .../src/com/cloud/consoleproxy/util/Logger.java | 414 ++-- .../com/cloud/consoleproxy/util/LoggerFactory.java | 10 +- .../src/com/cloud/consoleproxy/util/RawHTTP.java | 466 +++--- .../src/com/cloud/consoleproxy/util/Region.java | 148 +- .../cloud/consoleproxy/util/RegionClassifier.java | 84 +- .../src/com/cloud/consoleproxy/util/TileInfo.java | 78 +- .../com/cloud/consoleproxy/util/TileTracker.java | 506 +++--- .../consoleproxy/vnc/BufferedImageCanvas.java | 212 +- .../cloud/consoleproxy/vnc/FrameBufferCanvas.java | 26 +- .../vnc/FrameBufferUpdateListener.java | 10 +- .../vnc/PaintNotificationListener.java | 10 +- .../com/cloud/consoleproxy/vnc/RfbConstants.java | 117 +- .../src/com/cloud/consoleproxy/vnc/VncClient.java | 747 ++++---- .../consoleproxy/vnc/VncClientPacketSender.java | 380 ++-- .../consoleproxy/vnc/VncScreenDescription.java | 129 +- .../consoleproxy/vnc/VncServerPacketReceiver.java | 176 +- .../vnc/packet/client/ClientPacket.java | 2 +- .../client/FramebufferUpdateRequestPacket.java | 43 +- .../vnc/packet/client/KeyboardEventPacket.java | 30 +- .../vnc/packet/client/MouseEventPacket.java | 32 +- .../vnc/packet/client/SetEncodingsPacket.java | 37 +- .../vnc/packet/client/SetPixelFormatPacket.java | 82 +- .../vnc/packet/server/AbstractRect.java | 62 +- .../consoleproxy/vnc/packet/server/CopyRect.java | 20 +- .../server/FrameBufferSizeChangeRequest.java | 22 +- .../vnc/packet/server/FramebufferUpdatePacket.java | 133 +- .../consoleproxy/vnc/packet/server/RawRect.java | 67 +- .../cloud/consoleproxy/vnc/packet/server/Rect.java | 15 +- .../vnc/packet/server/ServerCutText.java | 32 +- console-proxy/ui/viewer-update.ftl | 48 +- .../resource/NfsSecondaryStorageResource.java | 14 +- debian/cloud-deps.install | 5 - debian/control | 12 +- deps/.classpath | 1 - deps/awsapi-lib/axis2.war | Bin 21406456 -> 0 bytes deps/awsapi-lib/rampart-lib/bcprov-jdk16-145.jar | Bin 1719483 -> 0 bytes .../rampart-lib/commons-collections-3.1.jar | Bin 559366 -> 0 bytes .../rampart-lib/commons-collections-LICENSE.txt | 202 -- deps/awsapi-lib/rampart-lib/joda-time-1.5.2.jar | Bin 531326 -> 0 bytes deps/awsapi-lib/rampart-lib/joda-time-LICENSE.txt | 202 -- deps/awsapi-lib/rampart-lib/opensaml-1.1.jar | Bin 155714 -> 0 bytes deps/awsapi-lib/rampart-lib/opensaml-2.2.3.jar | Bin 1244822 -> 0 bytes deps/awsapi-lib/rampart-lib/opensaml-LICENSE.txt | 202 -- deps/awsapi-lib/rampart-lib/openws-1.2.2.jar | Bin 119232 -> 0 bytes deps/awsapi-lib/rampart-lib/openws-LICENSE.txt | 202 -- deps/awsapi-lib/rampart-lib/rampart-core-1.5.jar | Bin 147797 -> 0 bytes deps/awsapi-lib/rampart-lib/rampart-policy-1.5.jar | Bin 150819 -> 0 bytes deps/awsapi-lib/rampart-lib/rampart-trust-1.5.jar | Bin 100039 -> 0 bytes deps/awsapi-lib/rampart-lib/slf4j-api-1.5.11.jar | Bin 23671 -> 0 bytes deps/awsapi-lib/rampart-lib/slf4j-api-LICENSE.txt | 12 - deps/awsapi-lib/rampart-lib/slf4j-jdk14-1.5.11.jar | Bin 8831 -> 0 bytes .../awsapi-lib/rampart-lib/slf4j-jdk14-LICENSE.txt | 12 - deps/awsapi-lib/rampart-lib/velocity-1.5.jar | Bin 392124 -> 0 bytes deps/awsapi-lib/rampart-lib/velocity-LICENSE.txt | 202 -- deps/awsapi-lib/rampart-lib/wss4j-1.5.8.jar | Bin 323799 -> 0 bytes deps/awsapi-lib/rampart-lib/wss4j-LICENSE.txt | 202 -- deps/awsapi-lib/rampart-lib/xmlsec-1.4.2.jar | Bin 444503 -> 0 bytes deps/awsapi-lib/rampart-lib/xmlsec-LICENSE.txt | 202 -- deps/awsapi-lib/rampart-lib/xmltooling-1.2.0.jar | Bin 575190 -> 0 bytes deps/awsapi-lib/rampart-lib/xmltooling-LICENSE.txt | 202 -- deps/pom.xml | 7 +- docs/en-US/release-notes-3.0.4.ent | 18 + docs/publican-cloudstack/README | 8 - docs/publican-cloudstack/defaults.cfg | 15 + docs/publican-cloudstack/en-US/Feedback.xml | 20 +- docs/publican-cloudstack/en-US/Legal_Notice.xml | 19 + docs/publican-cloudstack/en-US/css/overrides.css | 17 + docs/publican-cloudstack/en-US/images/.directory | 4 - .../en-US/images/title_logo.svg | 19 +- docs/publican-cloudstack/gen_rpm.sh | 22 + docs/publican-cloudstack/overrides.cfg | 15 + docs/publican-cloudstack/publican-cloudstack.spec | 28 +- docs/publican-cloudstack/publican.cfg | 15 + docs/runbook/README | 19 - docs/runbook/publican.cfg | 15 + .../debian/config/etc/init.d/cloud-early-config | 30 + .../debian/config/opt/cloud/bin/passwd_server | 3 +- .../debian/config/opt/cloud/bin/vpc_acl.sh | 11 +- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 18 +- .../hypervisor/vmware/resource/VmwareResource.java | 14 +- pom.xml | 6 +- scripts/storage/secondary/cloud-install-sys-tmplt | 2 +- scripts/vm/hypervisor/xenserver/vmops | 53 +- .../src/com/cloud/network/NetworkManagerImpl.java | 54 +- .../com/cloud/resource/ResourceManagerImpl.java | 17 +- .../src/com/cloud/storage/StorageManagerImpl.java | 7 +- server/src/com/cloud/vm/dao/DomainRouterDao.java | 9 +- .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java | 7 + server/src/com/cloud/vm/dao/VMInstanceDao.java | 9 +- server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 10 +- setup/db/create-schema.sql | 3 +- test/pom.xml | 100 + tools/ant/apache-ant-1.7.1/LICENSE | 272 --- tools/ant/apache-ant-1.7.1/bin/ant | 326 --- tools/ant/apache-ant-1.7.1/bin/ant.bat | 226 -- tools/ant/apache-ant-1.7.1/bin/ant.cmd | 93 - tools/ant/apache-ant-1.7.1/bin/antRun | 24 - tools/ant/apache-ant-1.7.1/bin/antRun.bat | 50 - tools/ant/apache-ant-1.7.1/bin/antRun.pl | 66 - tools/ant/apache-ant-1.7.1/bin/antenv.cmd | 98 - tools/ant/apache-ant-1.7.1/bin/complete-ant-cmd.pl | 114 - tools/ant/apache-ant-1.7.1/bin/envset.cmd | 131 -- tools/ant/apache-ant-1.7.1/bin/lcp.bat | 31 - tools/ant/apache-ant-1.7.1/bin/runant.pl | 153 -- tools/ant/apache-ant-1.7.1/bin/runant.py | 100 - tools/ant/apache-ant-1.7.1/bin/runrc.cmd | 60 - tools/ant/apache-ant-1.7.1/etc/ant-bootstrap.jar | Bin 18877 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/README | 16 - tools/ant/apache-ant-1.7.1/lib/ant-antlr.jar | Bin 5752 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-apache-bcel.jar | Bin 8611 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-apache-bsf.jar | Bin 3939 -> 0 bytes .../ant/apache-ant-1.7.1/lib/ant-apache-log4j.jar | Bin 3056 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-apache-oro.jar | Bin 39627 -> 0 bytes .../ant/apache-ant-1.7.1/lib/ant-apache-regexp.jar | Bin 3762 -> 0 bytes .../apache-ant-1.7.1/lib/ant-apache-resolver.jar | Bin 4071 -> 0 bytes .../apache-ant-1.7.1/lib/ant-commons-logging.jar | Bin 3910 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-commons-net.jar | Bin 47026 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-jai.jar | Bin 21348 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-javamail.jar | Bin 6998 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-jdepend.jar | Bin 8132 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-jmf.jar | Bin 6593 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-jsch.jar | Bin 30797 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-junit.jar | Bin 93518 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-launcher.jar | Bin 12143 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-netrexx.jar | Bin 9881 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-nodeps.jar | Bin 431580 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-starteam.jar | Bin 35355 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-stylebook.jar | Bin 2330 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-swing.jar | Bin 6738 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-testutil.jar | Bin 14941 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-trax.jar | Bin 6881 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant-weblogic.jar | Bin 14205 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/ant.jar | Bin 1323005 -> 0 bytes .../ant/apache-ant-1.7.1/lib/libraries.properties | 62 - tools/ant/apache-ant-1.7.1/lib/xercesImpl.jar | Bin 1223877 -> 0 bytes tools/ant/apache-ant-1.7.1/lib/xml-apis.jar | Bin 194354 -> 0 bytes tools/build/build_asf.sh | 22 +- tools/marvin/README | 17 +- tools/marvin/docs/tutorial.txt | 20 - tools/migration/10to21Upgrade.txt | 80 - tools/migration/XenAPI.py | 200 -- tools/migration/share_all_lus.sh | 238 --- tools/migration/upgrade.properties | 102 - tools/migration/upgrade.py | 1612 --------------- tools/test/apisession.py | 68 - tools/test/cloudkit.py | 78 - tools/test/db.py | 35 - tools/test/globalconfig.py | 35 - tools/test/physicalresource.py | 71 - tools/test/vm.py | 69 - tools/test/vmcreate.py | 36 - tools/whisker/descriptor.xml | 27 +- ui/dictionary.jsp | 18 + ui/scripts/network.js | 12 +- utils/pom.xml | 4 +- wscript | 5 +- wscript_build | 6 +- wscript_configure | 20 +- 255 files changed, 6066 insertions(+), 11782 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/90bf6c49/NOTICE ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/90bf6c49/build/build-cloud.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/90bf6c49/cloud.spec ----------------------------------------------------------------------
