Updated Branches: refs/heads/master 7545fe48a -> 25dd8de70
Fix dependencies for vmware hypervisor. Remove unused imports from VmwareResource as they caused a dependency to xapi. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/25dd8de7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/25dd8de7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/25dd8de7 Branch: refs/heads/master Commit: 25dd8de70ad54dce5e4cf358cad49892b1880033 Parents: 7545fe4 Author: Hugo Trippaers <[email protected]> Authored: Tue Oct 2 14:25:40 2012 -0700 Committer: Hugo Trippaers <[email protected]> Committed: Tue Oct 2 14:25:40 2012 -0700 ---------------------------------------------------------------------- console-proxy/pom.xml | 20 +++++++++++++++ plugins/hypervisors/vmware/pom.xml | 18 +++++++++++++ .../hypervisor/vmware/resource/VmwareResource.java | 3 -- 3 files changed, 38 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/25dd8de7/console-proxy/pom.xml ---------------------------------------------------------------------- diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml index a7fd1e5..5d350ae 100644 --- a/console-proxy/pom.xml +++ b/console-proxy/pom.xml @@ -141,6 +141,26 @@ </build> <profiles> <profile> + <id>vmware</id> + <activation> + <property> + <name>nonoss</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-plugin-hypervisor-vmware</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-vmware-base</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </profile> + <profile> <id>systemvm</id> <activation> <property> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/25dd8de7/plugins/hypervisors/vmware/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml index 22478c4..81d8dc1 100644 --- a/plugins/hypervisors/vmware/pom.xml +++ b/plugins/hypervisors/vmware/pom.xml @@ -32,5 +32,23 @@ <artifactId>cloud-vmware-base</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>com.cloud.com.vmware</groupId> + <artifactId>vmware-vim</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.cloud.com.vmware</groupId> + <artifactId>vmware-vim25</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.cloud.com.vmware</groupId> + <artifactId>vmware-apputils</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/25dd8de7/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 8993827..f89adf1 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -250,9 +250,6 @@ import com.vmware.vim25.VirtualMachineGuestOsIdentifier; import com.vmware.vim25.VirtualMachinePowerState; import com.vmware.vim25.VirtualMachineRuntimeInfo; import com.vmware.vim25.VirtualSCSISharing; -import com.xensource.xenapi.Connection; -import com.xensource.xenapi.VIF; -import com.xensource.xenapi.VM; public class VmwareResource implements StoragePoolResource, ServerResource, VmwareHostService { private static final Logger s_logger = Logger.getLogger(VmwareResource.class);
