Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6EE72DB49 for ; Tue, 5 Mar 2013 02:09:47 +0000 (UTC) Received: (qmail 17518 invoked by uid 500); 5 Mar 2013 02:09:46 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 17447 invoked by uid 500); 5 Mar 2013 02:09:46 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 17312 invoked by uid 99); 5 Mar 2013 02:09:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Mar 2013 02:09:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0D33E314BAD; Tue, 5 Mar 2013 02:09:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [40/40] git commit: refs/heads/master - Merge branch 'vim51_win8' Message-Id: <20130305020946.0D33E314BAD@tyr.zones.apache.org> Date: Tue, 5 Mar 2013 02:09:46 +0000 (UTC) Updated Branches: refs/heads/master 69678c82a -> 88355b945 Merge branch 'vim51_win8' Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/88355b94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/88355b94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/88355b94 Branch: refs/heads/master Commit: 88355b945740554447585e65539bb59d5f028fa0 Parents: 69678c8 613a061 Author: Min Chen Authored: Mon Mar 4 18:03:49 2013 -0800 Committer: Min Chen Committed: Mon Mar 4 18:03:49 2013 -0800 ---------------------------------------------------------------------- agent/src/com/cloud/agent/AgentShell.java | 4 +- client/tomcatconf/componentContext.xml.in | 13 +- client/tomcatconf/nonossComponentContext.xml.in | 14 +- deps/install-non-oss.sh | 11 +- plugins/hypervisors/vmware/pom.xml | 12 - .../hypervisor/vmware/VmwareServerDiscoverer.java | 125 +- .../vmware/manager/VmwareManagerImpl.java | 57 +- .../vmware/manager/VmwareStorageManagerImpl.java | 358 ++-- .../vmware/resource/VmwareContextFactory.java | 12 +- .../hypervisor/vmware/resource/VmwareResource.java | 258 ++-- .../VmwareSecondaryStorageContextFactory.java | 31 +- .../VmwareSecondaryStorageResourceHandler.java | 18 +- pom.xml | 5 +- .../cloud/baremetal/BareMetalTemplateAdapter.java | 33 +- .../cloud/template/HyervisorTemplateAdapter.java | 340 ---- .../cloud/template/HypervisorTemplateAdapter.java | 339 ++++ .../UserVmCloneSettingDaoTestConfiguration.java | 2 +- setup/db/db/schema-40to410.sql | 53 +- setup/db/db/schema-410to420.sql | 7 + vmware-base/pom.xml | 12 - .../src/com/cloud/hypervisor/vmware/mo/BaseMO.java | 74 +- .../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 318 ++-- .../vmware/mo/CustomFieldsManagerMO.java | 32 +- .../cloud/hypervisor/vmware/mo/DatacenterMO.java | 328 ++-- .../cloud/hypervisor/vmware/mo/DatastoreMO.java | 186 ++- .../vmware/mo/DistributedVirtualSwitchMO.java | 12 +- .../vmware/mo/HostDatastoreBrowserMO.java | 58 +- .../vmware/mo/HostDatastoreSystemMO.java | 92 +- .../hypervisor/vmware/mo/HostFirewallSystemMO.java | 14 +- .../src/com/cloud/hypervisor/vmware/mo/HostMO.java | 486 +++--- .../cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java | 109 +- .../hypervisor/vmware/mo/HypervisorHostHelper.java | 285 ++-- .../com/cloud/hypervisor/vmware/mo/NetworkMO.java | 15 +- .../cloud/hypervisor/vmware/mo/PerfManagerMO.java | 85 +- .../src/com/cloud/hypervisor/vmware/mo/TaskMO.java | 24 +- .../hypervisor/vmware/mo/VirtualDiskManagerMO.java | 126 +- .../hypervisor/vmware/mo/VirtualMachineMO.java | 1276 ++++++++------- .../cloud/hypervisor/vmware/util/VmwareClient.java | 558 +++++++ .../hypervisor/vmware/util/VmwareContext.java | 370 +++-- .../vmware/util/VmwareGuestOsMapper.java | 282 ++-- .../cloud/hypervisor/vmware/util/VmwareHelper.java | 269 ++-- .../vmware/mo/TestVmwareContextFactory.java | 14 +- .../cloud/hypervisor/vmware/mo/TestVmwareMO.java | 1 - vmware-base/test/com/cloud/vmware/TestVMWare.java | 7 +- 44 files changed, 3716 insertions(+), 3009 deletions(-) ----------------------------------------------------------------------