Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CD5E3EE3F for ; Tue, 25 Jun 2013 20:31:55 +0000 (UTC) Received: (qmail 26038 invoked by uid 500); 25 Jun 2013 20:31:55 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 25991 invoked by uid 500); 25 Jun 2013 20:31:55 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 25983 invoked by uid 99); 25 Jun 2013 20:31:55 -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, 25 Jun 2013 20:31:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 653151C2BA; Tue, 25 Jun 2013 20:31:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ahuang@apache.org To: commits@cloudstack.apache.org Date: Tue, 25 Jun 2013 20:31:56 -0000 Message-Id: <7247b6e6de554983bc8ed7eae2391812@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/vmsync to 5bd65da How did these things actually pass in master Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5bd65daa Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5bd65daa Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5bd65daa Branch: refs/heads/vmsync Commit: 5bd65daa03efa2fca9bea0c994530f5680d8d30e Parents: e622965 Author: Alex Huang Authored: Tue Jun 25 13:30:48 2013 -0700 Committer: Alex Huang Committed: Tue Jun 25 13:32:37 2013 -0700 ---------------------------------------------------------------------- client/pom.xml | 2 +- client/tomcatconf/nonossComponentContext.xml.in | 4 ++-- .../schema/src/com/cloud/storage/UploadVO.java | 24 ++++++++++---------- .../hypervisor/vmware/VmwareDatacenterVO.java | 14 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5bd65daa/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 8d61900..24f51fb 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -609,7 +609,7 @@ ${project.version} - + netapp http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5bd65daa/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index c2fe1bb..d4cc06d 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -104,12 +104,12 @@ - --> + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5bd65daa/engine/schema/src/com/cloud/storage/UploadVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/UploadVO.java b/engine/schema/src/com/cloud/storage/UploadVO.java index 63fadfa..f58cd2b 100755 --- a/engine/schema/src/com/cloud/storage/UploadVO.java +++ b/engine/schema/src/com/cloud/storage/UploadVO.java @@ -44,7 +44,7 @@ public class UploadVO implements Upload { private String uuid; @Column(name = "host_id") - private long storeId; + private long dataStoreId; @Column(name = "type_id") private long typeId; @@ -85,11 +85,11 @@ public class UploadVO implements Upload { @Override public long getDataStoreId() { - return storeId; + return dataStoreId; } public void setDataStoreId(long hostId) { - this.storeId = hostId; + dataStoreId = hostId; } @Override @@ -118,35 +118,35 @@ public class UploadVO implements Upload { public UploadVO(long hostId, long templateId) { super(); - this.storeId = hostId; - this.typeId = templateId; - this.uuid = UUID.randomUUID().toString(); + dataStoreId = hostId; + typeId = templateId; + uuid = UUID.randomUUID().toString(); } public UploadVO(long hostId, long typeId, Date lastUpdated, Status uploadState, Type type, String uploadUrl, Mode mode) { super(); - this.storeId = hostId; + dataStoreId = hostId; this.typeId = typeId; this.lastUpdated = lastUpdated; this.uploadState = uploadState; this.mode = mode; this.type = type; this.uploadUrl = uploadUrl; - this.uuid = UUID.randomUUID().toString(); + uuid = UUID.randomUUID().toString(); } public UploadVO(long hostId, long typeId, Date lastUpdated, Status uploadState, int uploadPercent, Type type, Mode mode) { super(); - this.storeId = hostId; + dataStoreId = hostId; this.typeId = typeId; this.lastUpdated = lastUpdated; this.uploadState = uploadState; this.uploadPercent = uploadPercent; this.type = type; this.mode = mode; - this.uuid = UUID.randomUUID().toString(); + uuid = UUID.randomUUID().toString(); } @@ -154,7 +154,7 @@ public class UploadVO implements Upload { } public UploadVO(Long uploadId) { - this.id = uploadId; + id = uploadId; } public void setErrorString(String errorString) { @@ -179,7 +179,7 @@ public class UploadVO implements Upload { public boolean equals(Object obj) { if (obj instanceof UploadVO) { UploadVO other = (UploadVO) obj; - return (this.typeId == other.getTypeId() && this.storeId == other.getDataStoreId() && this.type == other + return (typeId == other.getTypeId() && dataStoreId == other.getDataStoreId() && type == other .getType()); } return false; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5bd65daa/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java index a13e59e..5fca8ea 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java @@ -46,7 +46,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter { private String guid; @Column(name = "name") - private String name; + private String vmwareDatacenterName; @Column(name = "vcenter_host") private String vCenterHost; @@ -73,7 +73,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter { @Override public String getVmwareDatacenterName() { - return name; + return vmwareDatacenterName; } @Override @@ -105,7 +105,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter { } public void setVmwareDatacenterName(String name) { - this.name = name; + vmwareDatacenterName = name; } public void setVcenterHost(String vCenterHost) { @@ -133,15 +133,15 @@ public class VmwareDatacenterVO implements VmwareDatacenter { @Override public boolean equals(Object obj) { if (obj instanceof VmwareDatacenterVO) { - return ((VmwareDatacenterVO)obj).getId() == this.getId(); + return ((VmwareDatacenterVO)obj).getId() == getId(); } else { return false; } } public VmwareDatacenterVO(String guid, String name, String vCenterHost, String user, String password) { - this.uuid = UUID.randomUUID().toString(); - this.name = name; + uuid = UUID.randomUUID().toString(); + vmwareDatacenterName = name; this.guid = guid; this.vCenterHost = vCenterHost; this.user = user; @@ -154,7 +154,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter { } public VmwareDatacenterVO() { - this.uuid = UUID.randomUUID().toString(); + uuid = UUID.randomUUID().toString(); } }