Changeset 2260

Show
Ignore:
Timestamp:
07/03/08 12:50:11 (4 years ago)
Author:
leo
Message:

merged from branch

Location:
XerialJ/trunk/sqlite-jdbc
Files:
50 added
2 modified
2 copied

Legend:

Unmodified
Added
Removed

  • XerialJ/trunk/sqlite-jdbc/.classpath

    r1986 r2260  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<classpath> 
    3         <classpathentry kind="src" path="src/main/java"/> 
    4         <classpathentry excluding="**/*.java" including="native/**|org/**" kind="src" path="src/main/resources"/> 
    5         <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> 
    6         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_13"/> 
    7         <classpathentry kind="var" path="M2_REPO/junit/junit/4.1/junit-4.1.jar"/> 
    8         <classpathentry kind="output" path="target/classes"/> 
     2  <classpathentry kind="src" path="src/main/java"/> 
     3  <classpathentry kind="src" path="src/main/resources" including="native/**|org/**" excluding="**/*.java"/> 
     4  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> 
     5  <classpathentry kind="output" path="target/classes"/> 
     6  <classpathentry kind="var" path="M2_REPO/org/xerial/thirdparty/jdbc-api/1.4/jdbc-api-1.4.jar"/> 
     7  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     8  <classpathentry kind="var" path="M2_REPO/junit/junit/4.1/junit-4.1.jar"/> 
     9  <classpathentry kind="var" path="M2_REPO/org/xerial/xerial-core/0.8.0/xerial-core-0.8.0.jar"/> 
     10  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/> 
     11  <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.1-b1/stringtemplate-3.1-b1.jar"/> 
     12  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"/> 
     13  <classpathentry kind="var" path="M2_REPO/org/xerial/thirdparty/nestedvm/1.0/nestedvm-1.0.jar"/> 
     14  <classpathentry kind="var" path="M2_REPO/org/xerial/thirdparty/sqlitejdbc-nested/3.5.9/sqlitejdbc-nested-3.5.9.jar"/> 
    915</classpath> 

  • XerialJ/trunk/sqlite-jdbc/src/main/java/org/xerial/db/sql/sqlite/SQLiteJDBCLoader.java

    r2258 r2260  
    6262    public static boolean isNativeMode() 
    6363    { 
    64         try 
    65         { 
    66             // load the driver 
    67             Class.forName("org.sqlite.JDBC"); 
    68  
    69             return extracted; 
    70         } 
    71         catch (ClassNotFoundException e) 
    72         { 
    73             return false; 
    74         } 
     64        // load the driver 
     65        initialize(); 
     66        return extracted; 
    7567    } 
    7668 
    … …  
    119111        final String prefix = "sqlite-3.5.9-"; 
    120112 
    121         File extractedLibFile = new File(targetFolder, prefix + libraryFileName); 
     113        String extractedLibFileName = prefix + libraryFileName; 
     114        File extractedLibFile = new File(targetFolder, extractedLibFileName); 
    122115 
    123116        try 
    … …  
    131124                if (md5sum1.equals(md5sum2)) 
    132125                { 
    133                     return loadNativeLibrary(targetFolder, libraryFileName); 
     126                    return loadNativeLibrary(targetFolder, extractedLibFileName); 
    134127                } 
    135128                else 
    … …  
    169162            } 
    170163 
    171             return loadNativeLibrary(targetFolder, libraryFileName); 
     164            return loadNativeLibrary(targetFolder, extractedLibFileName); 
    172165        } 
    173166        catch (IOException e)