You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2008/08/23 10:17:03 UTC

svn commit: r688276 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main: java/org/apache/ibatis/migration/commands/BaseCommand.java scripts/migrate scripts/migrate.cmd

Author: cbegin
Date: Sat Aug 23 01:17:03 2008
New Revision: 688276

URL: http://svn.apache.org/viewvc?rev=688276&view=rev
Log:
minor output improvements

Modified:
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/scripts/migrate
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/scripts/migrate.cmd

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java?rev=688276&r1=688275&r2=688276&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java Sat Aug 23 01:17:03 2008
@@ -207,7 +207,7 @@
 
   private void lazyInitializeDrivers() {
     try {
-      if (driverClassLoader == null) {
+      if (driverClassLoader == null && driverPath.exists()) {
         List<URL> urlList = new ArrayList<URL>();
         for (File file : driverPath.listFiles()) {
           URL url = new URL("jar:file:/" + file.getAbsolutePath() + "!/");

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/scripts/migrate
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/scripts/migrate?rev=688276&r1=688275&r2=688276&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/scripts/migrate (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/scripts/migrate Sat Aug 23 01:17:03 2008
@@ -1,5 +1,7 @@
 #!/bin/sh
 
-IBATIS_LIB=/home/clinton/Development/ibatis-3/ibatis-3-core/target/classes
+CURDIR=$(dirname $0)
+JARS=$CURDIR/lib/
+MYCP=$(ls $JARS/ | sed "s#^#$JARS&#" | sed "s/$/:/" | xargs echo | sed 's/: */:/')
 
-java -cp $IBATIS_LIB org.apache.ibatis.migration.Migrator $*
+java -cp $MYCP org.apache.ibatis.migration.Migrator $*
\ No newline at end of file

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/scripts/migrate.cmd
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/scripts/migrate.cmd?rev=688276&r1=688275&r2=688276&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/scripts/migrate.cmd (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/scripts/migrate.cmd Sat Aug 23 01:17:03 2008
@@ -1,5 +1,7 @@
 @ECHO off
 
-set IBATIS_LIB=D:\Development\ibatis-3\ibatis-3-core\target\classes
+set CURDIR=%~dp0
+set JARS=%CURDIR%lib\
+for /F %%a in ('dir %JARS% /a /b /-p /o') do set MYCP=%JARS%%%a
 
-java -cp %IBATIS_LIB% org.apache.ibatis.migration.Migrator %*
+java -cp %MYCP% org.apache.ibatis.migration.Migrator %*