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 04F27DCE6 for ; Mon, 1 Oct 2012 21:07:40 +0000 (UTC) Received: (qmail 51723 invoked by uid 500); 1 Oct 2012 21:07:39 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 51650 invoked by uid 500); 1 Oct 2012 21:07:39 -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 51643 invoked by uid 99); 1 Oct 2012 21:07:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Oct 2012 21:07:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7EBB01EBBC; Mon, 1 Oct 2012 21:07:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hugo@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Provide an (for now) empty upgrade path so the server will start. Message-Id: <20121001210739.7EBB01EBBC@tyr.zones.apache.org> Date: Mon, 1 Oct 2012 21:07:39 +0000 (UTC) Updated Branches: refs/heads/master 90fd0793f -> 93aaa5f97 Provide an (for now) empty upgrade path so the server will start. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/93aaa5f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/93aaa5f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/93aaa5f9 Branch: refs/heads/master Commit: 93aaa5f97519a848bcd035e01343b4760812d0d7 Parents: 90fd079 Author: Hugo Trippaers Authored: Mon Oct 1 14:07:24 2012 -0700 Committer: Hugo Trippaers Committed: Mon Oct 1 14:07:24 2012 -0700 ---------------------------------------------------------------------- .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 3 + .../src/com/cloud/upgrade/dao/Upgrade40to41.java | 69 +++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/93aaa5f9/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java index 047bb3e..a84e6db 100755 --- a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java +++ b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java @@ -55,6 +55,7 @@ import com.cloud.upgrade.dao.Upgrade229to2210; import com.cloud.upgrade.dao.Upgrade301to302; import com.cloud.upgrade.dao.Upgrade302to40; import com.cloud.upgrade.dao.Upgrade30to301; +import com.cloud.upgrade.dao.Upgrade40to41; import com.cloud.upgrade.dao.UpgradeSnapshot217to224; import com.cloud.upgrade.dao.UpgradeSnapshot223to224; import com.cloud.upgrade.dao.VersionDao; @@ -157,6 +158,8 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker { _upgradeMap.put("3.0.1", new DbUpgrade[] { new Upgrade301to302(), new Upgrade302to40() }); _upgradeMap.put("3.0.2", new DbUpgrade[] { new Upgrade302to40() }); + + _upgradeMap.put("4.0.0", new DbUpgrade[] { new Upgrade40to41() }); } protected void runScript(Connection conn, File file) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/93aaa5f9/server/src/com/cloud/upgrade/dao/Upgrade40to41.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java new file mode 100644 index 0000000..58130ab --- /dev/null +++ b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java @@ -0,0 +1,69 @@ +/** + * + */ +package com.cloud.upgrade.dao; + +import java.io.File; +import java.sql.Connection; + +/** + * @author htrippaers + * + */ +public class Upgrade40to41 extends Upgrade30xBase implements DbUpgrade { + + /** + * + */ + public Upgrade40to41() { + // TODO Auto-generated constructor stub + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradableVersionRange() + */ + @Override + public String[] getUpgradableVersionRange() { + return new String[] { "4.0.0", "4.1.0" }; + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradedVersion() + */ + @Override + public String getUpgradedVersion() { + return "4.1.0"; + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#supportsRollingUpgrade() + */ + @Override + public boolean supportsRollingUpgrade() { + return false; + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getPrepareScripts() + */ + @Override + public File[] getPrepareScripts() { + return new File[0]; + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#performDataMigration(java.sql.Connection) + */ + @Override + public void performDataMigration(Connection conn) { + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getCleanupScripts() + */ + @Override + public File[] getCleanupScripts() { + return new File[0]; + } + +}