Revert "Fix fresh db install problem. (still pending one part of finding db"

minchen07 · minchen07 · commit ebcf6b1b7cd5 · 2013-02-22T21:38:15.000-08:00
This reverts commit 5b760f9.
diff --git a/server/src/com/cloud/upgrade/DatabaseCreator.java b/server/src/com/cloud/upgrade/DatabaseCreator.java
@@ -29,7 +29,6 @@
 
 import com.cloud.utils.PropertiesUtil;
 
-import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.component.SystemIntegrityChecker;
 import com.cloud.utils.db.ScriptRunner;
 import com.cloud.utils.db.Transaction;
@@ -193,8 +192,6 @@ public static void main(String[] args) {
             }
         }
 
-        Transaction txn = Transaction.open(Transaction.CLOUD_DB);
-        try {
         // Process db upgrade classes
         for (String upgradeClass: upgradeClasses) {
             System.out.println("========> Processing upgrade: " + upgradeClass);
@@ -205,22 +202,13 @@ public static void main(String[] args) {
                     System.err.println("The class must be of SystemIntegrityChecker: " + clazz.getName());
                     System.exit(1);
                 }
-                SystemIntegrityChecker checker = (SystemIntegrityChecker)clazz.newInstance();
-                checker.check();
             } catch (ClassNotFoundException e) {
                 System.err.println("Unable to find " + upgradeClass + ": " + e.getMessage());
                 System.exit(1);
-            } catch (InstantiationException e) {
-                System.err.println("Unable to instantiate " + upgradeClass + ": " + e.getMessage());
-                System.exit(1);
-            } catch (IllegalAccessException e) {
-                System.err.println("Unable to access " + upgradeClass + ": " + e.getMessage());
-                System.exit(1);
             }
 
-         }
-        } finally {
-            txn.close();
+            //SystemIntegrityChecker checker = (SystemIntegrityChecker)ComponentLocator.inject(clazz);
+            //checker.check();
         }
     }
 }
diff --git a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -31,6 +31,7 @@
 import java.util.TreeMap;
 
 import javax.ejb.Local;
+import javax.inject.Inject;
 
 import org.apache.log4j.Logger;
 
@@ -76,10 +77,9 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
 
     protected HashMap<String, DbUpgrade[]> _upgradeMap = new HashMap<String, DbUpgrade[]>();
 
-    VersionDao _dao;
+    @Inject VersionDao _dao;
 
     public DatabaseUpgradeChecker() {
-        _dao = new VersionDaoImpl();
         _upgradeMap.put("2.1.7", new DbUpgrade[] { new Upgrade217to218(), new Upgrade218to22(), new Upgrade221to222(),
                 new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(),
                 new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(),
@@ -115,12 +115,12 @@ public DatabaseUpgradeChecker() {
 
         _upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(),
                 new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(),
-                new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(),
+                new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), 
                 new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
 
         _upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(),
                 new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(),
-                new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(),
+                new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), 
                 new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
 
         _upgradeMap.put("2.2.6", new DbUpgrade[] { new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(),
@@ -159,7 +159,7 @@ public DatabaseUpgradeChecker() {
         _upgradeMap.put("3.0.1", new DbUpgrade[] { new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
 
         _upgradeMap.put("3.0.2", new DbUpgrade[] { new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
-
+        
         _upgradeMap.put("4.0.0", new DbUpgrade[] { new Upgrade40to41(), new Upgrade410to420() });
 
         _upgradeMap.put("4.1.0", new DbUpgrade[] { new Upgrade410to420() });
diff --git a/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java b/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java
@@ -47,7 +47,7 @@ public class VersionDaoImpl extends GenericDaoBase<VersionVO, Long> implements V
     final GenericSearchBuilder<VersionVO, String> CurrentVersionSearch;
     final SearchBuilder<VersionVO> AllFieldsSearch;
 
-    public VersionDaoImpl() {
+    protected VersionDaoImpl() {
         super();
 
         CurrentVersionSearch = createSearchBuilder(String.class);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@`
`29`	`29`
`30`	`30`	`import com.cloud.utils.PropertiesUtil;`
`31`	`31`
`32`		`-import com.cloud.utils.component.ComponentContext;`
`33`	`32`	`import com.cloud.utils.component.SystemIntegrityChecker;`
`34`	`33`	`import com.cloud.utils.db.ScriptRunner;`
`35`	`34`	`import com.cloud.utils.db.Transaction;`
`@@ -193,8 +192,6 @@ public static void main(String[] args) {`
`193`	`192`	`}`
`194`	`193`	`}`
`195`	`194`
`196`		`- Transaction txn = Transaction.open(Transaction.CLOUD_DB);`
`197`		`- try {`
`198`	`195`	`// Process db upgrade classes`
`199`	`196`	`for (String upgradeClass: upgradeClasses) {`
`200`	`197`	`System.out.println("========> Processing upgrade: " + upgradeClass);`
`@@ -205,22 +202,13 @@ public static void main(String[] args) {`
`205`	`202`	`System.err.println("The class must be of SystemIntegrityChecker: " + clazz.getName());`
`206`	`203`	`System.exit(1);`
`207`	`204`	`}`
`208`		`- SystemIntegrityChecker checker = (SystemIntegrityChecker)clazz.newInstance();`
`209`		`- checker.check();`
`210`	`205`	`} catch (ClassNotFoundException e) {`
`211`	`206`	`System.err.println("Unable to find " + upgradeClass + ": " + e.getMessage());`
`212`	`207`	`System.exit(1);`
`213`		`- } catch (InstantiationException e) {`
`214`		`- System.err.println("Unable to instantiate " + upgradeClass + ": " + e.getMessage());`
`215`		`- System.exit(1);`
`216`		`- } catch (IllegalAccessException e) {`
`217`		`- System.err.println("Unable to access " + upgradeClass + ": " + e.getMessage());`
`218`		`- System.exit(1);`
`219`	`208`	`}`
`220`	`209`
`221`		`- }`
`222`		`- } finally {`
`223`		`- txn.close();`
	`210`	`+ //SystemIntegrityChecker checker = (SystemIntegrityChecker)ComponentLocator.inject(clazz);`
	`211`	`+ //checker.check();`
`224`	`212`	`}`
`225`	`213`	`}`
`226`	`214`	`}`