git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/sqlite-jdbc@1978 ae02f08e...

diff --git a/pom.xml b/pom.xml
index 20f7f1a..b1f0514 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
   <modelVersion>4.0.0</modelVersion>\r
   <groupId>org.xerial</groupId>\r
   <artifactId>sqlite-jdbc</artifactId>\r
-  <version>v038.1</version>\r
+  <version>v038.2</version>\r
   <name>SQLite JDBC</name>\r
   <description>SQLite JDBC library</description>\r
 \r

diff --git a/src/main/java/org/sqlite/NativeDB.java b/src/main/java/org/sqlite/NativeDB.java
index db8f099..23abf83 100644 (file)
--- a/src/main/java/org/sqlite/NativeDB.java
+++ b/src/main/java/org/sqlite/NativeDB.java
@@ -13,11 +13,12 @@ final class NativeDB extends DB
 
     static boolean load()
     {
+        loaded = SQLiteJDBCLoader.initialize();
+        return loaded;
+        /*
         if (loaded != null)
             return loaded == Boolean.TRUE;
 
-        SQLiteJDBCLoader.initialize(true);
-
         String libpath = System.getProperty("org.sqlite.lib.path");
         String libname = System.getProperty("org.sqlite.lib.name");
         if (libname == null)
@@ -37,7 +38,8 @@ final class NativeDB extends DB
         }
 
         loaded = Boolean.TRUE;
-        return true;
+        */
+        //return true;
     }
 
     /** linked list of all instanced UDFDatas */

diff --git a/src/main/java/org/xerial/db/sql/sqlite/SQLiteJDBCLoader.java b/src/main/java/org/xerial/db/sql/sqlite/SQLiteJDBCLoader.java
index 82ad23f..fd3cd35 100644 (file)
--- a/src/main/java/org/xerial/db/sql/sqlite/SQLiteJDBCLoader.java
+++ b/src/main/java/org/xerial/db/sql/sqlite/SQLiteJDBCLoader.java
@@ -47,16 +47,18 @@ public class SQLiteJDBCLoader
 \r
     private static boolean extracted = false;\r
 \r
-    public static void initialize()\r
+    public static boolean initialize()\r
     {\r
-        setSQLiteNativeLibraryPath();\r
+        loadSQLiteNativeLibrary();\r
+        return extracted;\r
     }\r
 \r
-    public static void initialize(boolean forceReload)\r
+    public static boolean initialize(boolean forceReload)\r
     {\r
         if (forceReload)\r
             extracted = false;\r
-        setSQLiteNativeLibraryPath();\r
+        loadSQLiteNativeLibrary();\r
+        return extracted;\r
     }\r
 \r
     private static boolean extractLibraryFile(String libraryResourcePath, String libraryFolder, String libraryFileName)\r
@@ -91,7 +93,7 @@ public class SQLiteJDBCLoader
                 }\r
             }\r
 \r
-            return setNativeLibraryPath(libraryFolder, libraryFileName);\r
+            return loadNativeLibrary(libraryFolder, libraryFileName);\r
         }\r
         catch (IOException e)\r
         {\r
@@ -101,20 +103,32 @@ public class SQLiteJDBCLoader
 \r
     }\r
 \r
-    private static boolean setNativeLibraryPath(String path, String name)\r
+    private static boolean loadNativeLibrary(String path, String name)\r
     {\r
         File libPath = new File(path, name);\r
         if (libPath.exists())\r
         {\r
-            System.setProperty("org.sqlite.lib.path", path == null ? "./" : path);\r
-            System.setProperty("org.sqlite.lib.name", name);\r
-            return true;\r
+            // System.setProperty("org.sqlite.lib.path", path == null ? "./" :\r
+            // path);\r
+            // System.setProperty("org.sqlite.lib.name", name);\r
+\r
+            try\r
+            {\r
+                System.load(new File(path, name).getAbsolutePath());\r
+                return true;\r
+            }\r
+            catch (UnsatisfiedLinkError e)\r
+            {\r
+                System.err.println(e);\r
+                return false;\r
+            }\r
+\r
         }\r
         else\r
             return false;\r
     }\r
 \r
-    private static void setSQLiteNativeLibraryPath()\r
+    private static void loadSQLiteNativeLibrary()\r
     {\r
         if (extracted)\r
             return;\r
@@ -127,7 +141,7 @@ public class SQLiteJDBCLoader
 \r
         if (sqliteNativeLibraryPath != null)\r
         {\r
-            if (setNativeLibraryPath(sqliteNativeLibraryPath, sqliteNativeLibraryName))\r
+            if (loadNativeLibrary(sqliteNativeLibraryPath, sqliteNativeLibraryName))\r
             {\r
                 extracted = true;\r
                 return;\r

diff --git a/src/main/resources/org/sqlite/Codes.class b/src/main/resources/org/sqlite/Codes.class
deleted file mode 100644 (file)
index 8598062..0000000
Binary files a/src/main/resources/org/sqlite/Codes.class and /dev/null differ

diff --git a/src/main/resources/org/sqlite/Conn.class b/src/main/resources/org/sqlite/Conn.class
deleted file mode 100644 (file)
index bd867d5..0000000
Binary files a/src/main/resources/org/sqlite/Conn.class and /dev/null differ

diff --git a/src/main/resources/org/sqlite/DB.class b/src/main/resources/org/sqlite/DB.class
deleted file mode 100644 (file)
index d619be1..0000000
Binary files a/src/main/resources/org/sqlite/DB.class and /dev/null differ

diff --git a/src/main/resources/org/sqlite/Function$Aggregate.class b/src/main/resources/org/sqlite/Function$Aggregate.class
deleted file mode 100644 (file)
index 182a5de..0000000
Binary files a/src/main/resources/org/sqlite/Function$Aggregate.class and /dev/null differ

diff --git a/src/main/resources/org/sqlite/Function.class b/src/main/resources/org/sqlite/Function.class
deleted file mode 100644 (file)
index 9c108af..0000000
Binary files a/src/main/resources/org/sqlite/Function.class and /dev/null differ

diff --git a/src/main/resources/org/sqlite/JDBC.class b/src/main/resources/org/sqlite/JDBC.class
deleted file mode 100644 (file)
index 7e2bd4f..0000000
Binary files a/src/main/resources/org/sqlite/JDBC.class and /dev/null differ

diff --git a/src/main/resources/org/sqlite/MetaData.class b/src/main/resources/org/sqlite/MetaData.class
deleted file mode 100644 (file)
index 7282414..0000000
Binary files a/src/main/resources/org/sqlite/MetaData.class and /dev/null differ

diff --git a/src/main/resources/org/sqlite/NativeDB.class b/src/main/resources/org/sqlite/NativeDB.class
deleted file mode 100644 (file)
index 8c0ee03..0000000
Binary files a/src/main/resources/org/sqlite/NativeDB.class and /dev/null differ

diff --git a/src/main/resources/org/sqlite/PrepStmt.class b/src/main/resources/org/sqlite/PrepStmt.class
deleted file mode 100644 (file)
index 19761a1..0000000
Binary files a/src/main/resources/org/sqlite/PrepStmt.class and /dev/null differ

diff --git a/src/main/resources/org/sqlite/RS.class b/src/main/resources/org/sqlite/RS.class
deleted file mode 100644 (file)
index cf8e457..0000000
Binary files a/src/main/resources/org/sqlite/RS.class and /dev/null differ

diff --git a/src/main/resources/org/sqlite/Stmt.class b/src/main/resources/org/sqlite/Stmt.class
deleted file mode 100644 (file)
index a2c9e85..0000000
Binary files a/src/main/resources/org/sqlite/Stmt.class and /dev/null differ

diff --git a/src/main/resources/org/sqlite/Unused.class b/src/main/resources/org/sqlite/Unused.class
deleted file mode 100644 (file)
index 147b59f..0000000
Binary files a/src/main/resources/org/sqlite/Unused.class and /dev/null differ