Author: cbegin
Date: Sat Aug 23 12:50:55 2008
New Revision: 688403
URL: http://svn.apache.org/viewvc?rev=688403&view=rev
Log:
migrator finished for now
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=688403&r1=688402&r2=688403&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 12:50:55 2008
@@ -210,8 +210,12 @@
if (driverClassLoader == null && driverPath.exists()) {
List<URL> urlList = new ArrayList<URL>();
for (File file : driverPath.listFiles()) {
- URL url = new URL("jar:file:/" + file.getAbsolutePath() + "!/");
- urlList.add(url);
+ String filename = file.getCanonicalPath();
+ if (!filename.startsWith("/")) {
+ filename = "/" + filename;
+ }
+ urlList.add(new URL("jar:file:" + filename + "!/"));
+ urlList.add(new URL("file:" + filename));
}
URL[] urls = urlList.toArray(new URL[urlList.size()]);
driverClassLoader = new URLClassLoader(urls);
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=688403&r1=688402&r2=688403&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 12:50:55 2008
@@ -1,7 +1,13 @@
#!/bin/sh
-CURDIR=$(dirname $0)
-JARS=$CURDIR/lib/
-MYCP=$(ls $JARS/ | sed "s#^#$JARS&#" | sed "s/$/:/" | xargs echo | sed 's/:
*/:/')
+WORKING_DIR=`pwd -P`
+SCRIPT_PATH=$(dirname $0)
-java -cp $MYCP org.apache.ibatis.migration.Migrator $*
\ No newline at end of file
+cd $SCRIPT_PATH
+SCRIPT_PATH=`pwd -P`
+cd $WORKING_DIR
+
+LIB=$SCRIPT_PATH/lib/
+MIGRATOR_CP=$(ls $LIB/ | sed "s#^#$LIB&#" | sed "s/$/:/" | xargs echo | sed
's/: */:/')
+
+java -cp $MIGRATOR_CP org.apache.ibatis.migration.Migrator $*
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=688403&r1=688402&r2=688403&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 12:50:55 2008
@@ -1,7 +1,7 @@
@ECHO off
-set CURDIR=%~dp0
-set JARS=%CURDIR%lib\
-for /F %%a in ('dir %JARS% /a /b /-p /o') do set MYCP=%JARS%%%a
+set WORKING_DIR=%~dp0
+set LIB=%WORKING_DIR%lib\
+for /F %%a in ('dir %LIB% /a /b /-p /o') do set MIGRATOR_CP=%LIB%%%a
-java -cp %MYCP% org.apache.ibatis.migration.Migrator %*
+java -cp %MIGRATOR_CP% org.apache.ibatis.migration.Migrator %*
