svn commit: r688952 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration: Change.java commands/BootstrapCommand.java commands/InitializeCommand.java

[cbegin]

Author: cbegin
Date: Mon Aug 25 20:40:07 2008
New Revision: 688952

URL: http://svn.apache.org/viewvc?rev=688952&view=rev
Log:
added force feature and initializer to bootstrap.

Modified:
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Change.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/InitializeCommand.java

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Change.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Change.java?rev=688952&r1=688951&r2=688952&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Change.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Change.java
 Mon Aug 25 20:40:07 2008
@@ -55,7 +55,7 @@
   }
 
   public String toString() {
-    return id + " " + (appliedTimestamp == null ? "pending            " : 
appliedTimestamp) + " " + description;
+    return id + " " + (appliedTimestamp == null ? "   ...pending...   " : 
appliedTimestamp) + " " + description;
   }
 
   public boolean equals(Object o) {

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java?rev=688952&r1=688951&r2=688952&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java
 Mon Aug 25 20:40:07 2008
@@ -13,8 +13,8 @@
 
   public void execute(String... params) {
     try {
-      if (changelogExists()) {
-        out.println("For your safety, the bootstrap SQL script will only run 
before migrations are applied (i.e. before the changelog exists).");
+      if (changelogExists() && !force) {
+        out.println("For your safety, the bootstrap SQL script will only run 
before migrations are applied (i.e. before the changelog exists).  If you're 
certain, you can run it using the --force option.");
       } else {
         File bootstrap = scriptFile("bootstrap.sql");
         if (bootstrap.exists()) {
@@ -26,7 +26,7 @@
         }
       }
     } catch (Exception e) {
-      throw new RuntimeException("<Description>.  Cause: " + e, e);
+      throw new RuntimeException("Error running bootstrapper.  Cause: " + e, 
e);
     }
   }
 

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/InitializeCommand.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/InitializeCommand.java?rev=688952&r1=688951&r2=688952&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/InitializeCommand.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/InitializeCommand.java
 Mon Aug 25 20:40:07 2008
@@ -23,6 +23,7 @@
     
     copyResourceTo("org/apache/ibatis/migration/template_README", 
baseFile("README"));
     
copyResourceTo("org/apache/ibatis/migration/template_environment.properties", 
environmentFile());
+    copyResourceTo("org/apache/ibatis/migration/template_bootstrap.sql", 
scriptFile("bootstrap.sql"));
     copyResourceTo("org/apache/ibatis/migration/template_changelog.sql", 
scriptFile(getNextIDAsString() + "_create_changelog.sql"));
     copyResourceTo("org/apache/ibatis/migration/template_migration.sql", 
scriptFile(getNextIDAsString() + "_first_migration.sql"),
         new Properties(){{setProperty("description","First migration.");}});