You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2015/05/30 06:01:28 UTC
airavata git commit: Update DBMigrator.java
Repository: airavata
Updated Branches:
refs/heads/master 6a5ed6e96 -> 14fe107ce
Update DBMigrator.java
The airavata version is hard code as "0.5" in a couple of places. Added a static final variable instead. Also, there are many other things which are hard coded and require clean up.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/14fe107c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/14fe107c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/14fe107c
Branch: refs/heads/master
Commit: 14fe107ce1fbe8cdf69e289a5fad00bc80b9316f
Parents: 6a5ed6e
Author: sahitya pavurala <sp...@nyu.edu>
Authored: Fri May 29 22:02:42 2015 -0400
Committer: sahitya pavurala <sp...@nyu.edu>
Committed: Fri May 29 22:02:42 2015 -0400
----------------------------------------------------------------------
.../main/java/org/apache/airavata/registry/tool/DBMigrator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/14fe107c/tools/registry-tool/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java
----------------------------------------------------------------------
diff --git a/tools/registry-tool/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java b/tools/registry-tool/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java
index 958ac23..487af1c 100644
--- a/tools/registry-tool/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java
+++ b/tools/registry-tool/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java
@@ -38,6 +38,7 @@ public class DBMigrator {
private static final String MIGRATE_SQL_DERBY = "migrate_derby.sql";
private static final String MIGRATE_SQL_MYSQL = "migrate_mysql.sql";
private static final String REGISTRY_VERSION = "registry.version";
+ private static final String AIRAVATA_VERSION = "0.5";
private static String currentAiravataVersion;
private static String relativePath;
private static String SELECT_QUERY;
@@ -114,7 +115,7 @@ public class DBMigrator {
}
private static boolean canUpdated (Connection conn){
- if (!currentAiravataVersion.equals("0.5")){
+ if (!currentAiravataVersion.equals(AIRAVATA_VERSION)){
String config = executeSelectQuery(conn);
if (config != null){
if (config.equals(getIncrementedVersion(currentAiravataVersion))) {
@@ -123,7 +124,7 @@ public class DBMigrator {
return true;
}
}
- } else if (currentAiravataVersion.equals("0.5")){
+ } else if (currentAiravataVersion.equals(AIRAVATA_VERSION)){
return true;
}
return false;