Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 59B54200AE2 for ; Fri, 27 May 2016 21:21:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5840B160A12; Fri, 27 May 2016 19:21:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 516C8160A3B for ; Fri, 27 May 2016 21:21:52 +0200 (CEST) Received: (qmail 95465 invoked by uid 500); 27 May 2016 19:21:51 -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 95092 invoked by uid 99); 27 May 2016 19:21:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2016 19:21:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AAC00E0B4E; Fri, 27 May 2016 19:21:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Fri, 27 May 2016 19:21:54 -0000 Message-Id: <13c3d24764054aaea88b1105dc2d0ed6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/16] git commit: updated refs/heads/master to 237bd46 archived-at: Fri, 27 May 2016 19:21:53 -0000 Fix URL length to 2048 for all url fields in VO Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a59ee03f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a59ee03f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a59ee03f Branch: refs/heads/master Commit: a59ee03fd79806dcb3a8842c318e2cd06895183f Parents: 88cd182 Author: Marc-Aurèle Brothier Authored: Fri May 27 08:16:05 2016 +0200 Committer: Marc-Aurèle Brothier Committed: Fri May 27 08:16:05 2016 +0200 ---------------------------------------------------------------------- .../cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java | 2 +- engine/schema/src/com/cloud/host/HostVO.java | 2 +- engine/schema/src/com/cloud/storage/UploadVO.java | 2 +- engine/schema/src/com/cloud/storage/VMTemplateHostVO.java | 2 +- engine/schema/src/com/cloud/storage/VMTemplateVO.java | 2 +- engine/schema/src/com/cloud/storage/VolumeHostVO.java | 2 +- .../org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java | 2 +- .../cloudstack/storage/datastore/db/TemplateDataStoreVO.java | 4 ++-- .../cloudstack/storage/datastore/db/VolumeDataStoreVO.java | 4 ++-- .../org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java | 2 +- server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java | 2 +- setup/db/db/schema-471to480.sql | 2 ++ 12 files changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java index efa34df..eece93a 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java @@ -329,7 +329,7 @@ public class EngineHostVO implements EngineHost, Identity { @Column(name = "cpus") private Integer cpus; - @Column(name = "url") + @Column(name = "url", length = 2048) private String storageUrl; @Column(name = "speed") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/com/cloud/host/HostVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/host/HostVO.java b/engine/schema/src/com/cloud/host/HostVO.java index c5938d6..4d1896c 100644 --- a/engine/schema/src/com/cloud/host/HostVO.java +++ b/engine/schema/src/com/cloud/host/HostVO.java @@ -337,7 +337,7 @@ public class HostVO implements Host { @Column(name = "cpus") private Integer cpus; - @Column(name = "url") + @Column(name = "url", length = 2048) private String storageUrl; @Column(name = "speed") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/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 c49b28b..dda5c38 100644 --- a/engine/schema/src/com/cloud/storage/UploadVO.java +++ b/engine/schema/src/com/cloud/storage/UploadVO.java @@ -77,7 +77,7 @@ public class UploadVO implements Upload { @Column(name = "job_id") private String jobId; - @Column(name = "url") + @Column(name = "url", length = 2048) private String uploadUrl; @Column(name = "install_path") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java b/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java index 4ba5088..fc4d9c1 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java @@ -84,7 +84,7 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc, DataObj @Column(name = "install_path") private String installPath; - @Column(name = "url") + @Column(name = "url", length = 2048) private String downloadUrl; @Column(name = "is_copy") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/com/cloud/storage/VMTemplateVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/com/cloud/storage/VMTemplateVO.java index dd2b35a..d28c23b 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateVO.java @@ -63,7 +63,7 @@ public class VMTemplateVO implements VirtualMachineTemplate { @Column(name = "type") private Storage.TemplateType templateType; - @Column(name = "url") + @Column(name = "url", length = 2048) private String url = null; @Column(name = "hvm") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/com/cloud/storage/VolumeHostVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/VolumeHostVO.java b/engine/schema/src/com/cloud/storage/VolumeHostVO.java index 56a9a92..d086f2d 100644 --- a/engine/schema/src/com/cloud/storage/VolumeHostVO.java +++ b/engine/schema/src/com/cloud/storage/VolumeHostVO.java @@ -93,7 +93,7 @@ public class VolumeHostVO implements InternalIdentity, DataObjectInStore { @Column(name = "install_path") private String installPath; - @Column(name = "url") + @Column(name = "url", length = 2048) private String downloadUrl; @Column(name = "format") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java index 2d1a3ed..2c70677 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java @@ -51,7 +51,7 @@ public class ImageStoreVO implements ImageStore { @Column(name = "protocol", nullable = false) private String protocol; - @Column(name = "url", nullable = false) + @Column(name = "url", nullable = false, length = 2048) private String url; @Column(name = "image_provider_name", nullable = false) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java index bb05300..024f056 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java @@ -95,10 +95,10 @@ public class TemplateDataStoreVO implements StateObject