fixing merge problem 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/0b04e767 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0b04e767 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0b04e767 Branch: refs/heads/deps-ctrl Commit: 0b04e76722bcdc54c2f00dac8695c5514bea9164 Parents: 4d1ad11 cc08eee Author: David Nalley <[email protected]> Authored: Tue Jul 31 16:34:34 2012 -0400 Committer: David Nalley <[email protected]> Committed: Tue Jul 31 16:34:34 2012 -0400 ---------------------------------------------------------------------- agent/.classpath | 18 + agent/.project | 18 + agent/conf/agent.properties | 2 +- agent/conf/dummy.agent.properties | 17 + agent/conf/environment.properties.in | 2 +- agent/conf/log4j-cloud.xml.in | 18 + agent/doc/README-iscsi.txt | 17 + agent/doc/README.txt | 17 + agent/scripts/run.sh | 2 +- .../resource/computing/FakeComputingResource.java | 642 --- .../agent/resource/computing/KVMGuestOsMapper.java | 169 - .../cloud/agent/resource/computing/KVMHABase.java | 220 - .../agent/resource/computing/KVMHAChecker.java | 85 - .../agent/resource/computing/KVMHAMonitor.java | 119 - .../resource/computing/LibvirtCapXMLParser.java | 194 - .../computing/LibvirtComputingResource.java | 4118 --------------- .../resource/computing/LibvirtConnection.java | 48 - .../resource/computing/LibvirtDomainXMLParser.java | 253 - .../resource/computing/LibvirtNetworkDef.java | 193 - .../agent/resource/computing/LibvirtSecretDef.java | 106 - .../resource/computing/LibvirtStoragePoolDef.java | 162 - .../computing/LibvirtStoragePoolXMLParser.java | 128 - .../computing/LibvirtStorageVolumeDef.java | 91 - .../computing/LibvirtStorageVolumeXMLParser.java | 104 - .../agent/resource/computing/LibvirtVMDef.java | 964 ---- .../agent/resource/computing/LibvirtXMLParser.java | 72 - .../com/cloud/agent/storage/KVMPhysicalDisk.java | 98 - .../com/cloud/agent/storage/KVMStoragePool.java | 65 - .../cloud/agent/storage/KVMStoragePoolManager.java | 109 - .../com/cloud/agent/storage/KVMVirtualDisk.java | 21 - .../cloud/agent/storage/LibvirtStorageAdaptor.java | 901 ---- .../cloud/agent/storage/LibvirtStoragePool.java | 208 - .../com/cloud/agent/storage/StorageAdaptor.java | 70 - build/build-cloud-plugins.xml | 9 +- build/build-marvin.xml | 4 +- build/developer.xml | 6 +- build/package.xml | 15 +- cloud.spec | 1 + .../kvm/resource/KvmDummyResourceBase.java | 89 - debian/cloud-agent-libs.install | 1 + plugins/hypervisors/kvm/.classpath | 11 + plugins/hypervisors/kvm/.project | 23 + plugins/hypervisors/kvm/.pydevproject | 7 + plugins/hypervisors/kvm/build.xml | 137 + .../kvm/resource/FakeComputingResource.java | 641 +++ .../hypervisor/kvm/resource/KVMGuestOsMapper.java | 169 + .../cloud/hypervisor/kvm/resource/KVMHABase.java | 219 + .../hypervisor/kvm/resource/KVMHAChecker.java | 84 + .../hypervisor/kvm/resource/KVMHAMonitor.java | 119 + .../kvm/resource/LibvirtCapXMLParser.java | 194 + .../kvm/resource/LibvirtComputingResource.java | 4118 +++++++++++++++ .../hypervisor/kvm/resource/LibvirtConnection.java | 48 + .../kvm/resource/LibvirtDomainXMLParser.java | 250 + .../hypervisor/kvm/resource/LibvirtNetworkDef.java | 193 + .../hypervisor/kvm/resource/LibvirtSecretDef.java | 106 + .../kvm/resource/LibvirtStoragePoolDef.java | 162 + .../kvm/resource/LibvirtStoragePoolXMLParser.java | 128 + .../kvm/resource/LibvirtStorageVolumeDef.java | 91 + .../resource/LibvirtStorageVolumeXMLParser.java | 104 + .../hypervisor/kvm/resource/LibvirtVMDef.java | 963 ++++ .../hypervisor/kvm/resource/LibvirtXMLParser.java | 72 + .../hypervisor/kvm/storage/KVMPhysicalDisk.java | 98 + .../hypervisor/kvm/storage/KVMStoragePool.java | 65 + .../kvm/storage/KVMStoragePoolManager.java | 109 + .../hypervisor/kvm/storage/KVMVirtualDisk.java | 21 + .../kvm/storage/LibvirtStorageAdaptor.java | 901 ++++ .../hypervisor/kvm/storage/LibvirtStoragePool.java | 208 + .../hypervisor/kvm/storage/StorageAdaptor.java | 68 + python/lib/cloudutils/serviceConfig.py | 190 +- .../com/cloud/agent/manager/AgentManagerImpl.java | 2 +- .../com/cloud/baremetal/BareMetalResourceBase.java | 1 - .../kvm/discoverer/KvmDummyResourceBase.java | 88 + .../kvm/discoverer/KvmServerDiscoverer.java | 7 +- .../src/com/cloud/network/NetworkManagerImpl.java | 26 +- .../com/cloud/resource/ResourceManagerImpl.java | 2 +- setup/apidoc/gen_toc.py | 1 + setup/db/create-schema.sql | 2 +- setup/db/db/schema-303to40.sql | 24 +- .../puppet-devcloud/files/startdevcloud.sh | 23 + .../devcloudbox/puppet-devcloud/manifests/init.pp | 28 +- tools/devcloud/devcloudsetup.sh | 2 +- tools/marvin/setup.py | 3 +- ui/scripts/instances.js | 2 +- ui/scripts/zoneWizard.js | 9 +- 84 files changed, 9733 insertions(+), 9362 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0b04e767/build/build-cloud-plugins.xml ---------------------------------------------------------------------- diff --cc build/build-cloud-plugins.xml index fbb2bcc,a7a1f39..a639d6a --- a/build/build-cloud-plugins.xml +++ b/build/build-cloud-plugins.xml @@@ -198,9 -198,14 +198,14 @@@ <!-- ===================== Hypervisors ========================= --> - <target name="compile-hypervisors" depends="compile-ovm, compile-xen" description="Compile all hypervisors"/> - <target name="build-hypervisors" depends="build-ovm, build-xen" description="Builds all hypervisors"/> - <target name="compile-hypervisors" depends="compile-kvm, compile-ovm, compile-xen, compile-vmware" description="Compile all hypervisors"/> - <target name="build-hypervisors" depends="build-kvm, build-ovm, build-xen, build-vmware" description="Builds all hypervisors"/> ++ <target name="compile-hypervisors" depends="compile-kvm, compile-ovm, compile-xen" description="Compile all hypervisors"/> ++ <target name="build-hypervisors" depends="build-kvm, build-ovm, build-xen" description="Builds all hypervisors"/> + <target name="compile-kvm" depends="-init, compile-core, compile-agent" description="Compile KVM"> + <ant antfile="${base.dir}/plugins/hypervisors/kvm/build.xml" target="build"/> + </target> + <target name="build-kvm" depends="compile-kvm" /> + <target name="compile-ovm" depends="-init, compile-server" description="Compile OVM"> <ant antfile="${base.dir}/plugins/hypervisors/ovm/build.xml" target="build"/> </target>
