upgraded to sqlitejdbc-v038

git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/sqlite-jdbc@1910 ae02f08e-27ec-0310-ae8c-8ba02fe2eafd

diff --git a/.classpath b/.classpath
index 271f62f..01698ea 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -5,5 +5,6 @@
        <classpathentry including="**|**/*.class" kind="src" path="src/main/resources"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>\r
+       <classpathentry kind="lib" path="lib/sqlitejdbc-v038-native.jar"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r

diff --git a/lib/sqlitejdbc-v037-native.jar b/lib/sqlitejdbc-v037-native.jar
deleted file mode 100644 (file)
index f5ac8aa..0000000
Binary files a/lib/sqlitejdbc-v037-native.jar and /dev/null differ

diff --git a/lib/sqlitejdbc-v038-native.jar b/lib/sqlitejdbc-v038-native.jar
new file mode 100644 (file)
index 0000000..fe74878
Binary files /dev/null and b/lib/sqlitejdbc-v038-native.jar differ

diff --git a/pom.xml b/pom.xml
index ead1437..0529db8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
   <modelVersion>4.0.0</modelVersion>\r
   <groupId>org.xerial</groupId>\r
   <artifactId>sqlite-jdbc</artifactId>\r
-  <version>${sqlite.os}-v037</version>\r
+  <version>${sqlite.os}-v038</version>\r
   <name>SQLite JDBC</name>\r
   <description>SQLite JDBC library</description>\r
 \r

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 328ae84..247b71c 100644 (file)
--- a/src/main/java/org/xerial/db/sql/sqlite/SQLiteJDBCLoader.java
+++ b/src/main/java/org/xerial/db/sql/sqlite/SQLiteJDBCLoader.java
@@ -35,14 +35,14 @@ public class SQLiteJDBCLoader {
         setSQLiteNativeLibraryPath();\r
     }\r
     \r
-    private static boolean extractLibraryFile(String libraryName, String outputFileName)\r
+    private static boolean extractLibraryFile(String libraryResourcePath, String libraryFolder, String libraryFileName)\r
     {\r
-        File libFile = new File(outputFileName);\r
+        File libFile = new File(libraryFolder, libraryFileName);\r
 \r
         try\r
         {\r
             // extract file into the current directory\r
-            InputStream reader = SQLiteJDBCLoader.class.getResourceAsStream(libraryName);\r
+            InputStream reader = SQLiteJDBCLoader.class.getResourceAsStream(libraryResourcePath);\r
             FileOutputStream writer = new FileOutputStream(libFile);\r
             byte[] buffer = new byte[1024];\r
             int bytesRead = 0;\r
@@ -57,11 +57,11 @@ public class SQLiteJDBCLoader {
             if(!System.getProperty("os.name").contains("Windows"))\r
             {\r
                 try {\r
-                    Runtime.getRuntime ().exec (new String []{"chmod", "755", outputFileName}).waitFor(); \r
+                    Runtime.getRuntime ().exec (new String []{"chmod", "755", libFile.getAbsolutePath()}).waitFor(); \r
                 } catch (Throwable e) {}\r
             }\r
             \r
-            return setNativeLibraryPath(null, outputFileName);\r
+            return setNativeLibraryPath(libraryFolder, libraryFileName);\r
         }\r
         catch (IOException e)\r
         {\r
@@ -120,8 +120,10 @@ public class SQLiteJDBCLoader {
         else\r
             throw new UnsupportedOperationException("unsupported OS for SQLite-JDBC driver: " + osName);\r
 \r
-        /* Try extracting and loading library from jar */\r
-        if (extractLibraryFile(sqliteNativeLibraryPath + "/" + sqliteNativeLibraryName,\r
+        // temporary library folder\r
+        String libraryFolder = new File(System.getProperty("java.io.tmpdir")).getAbsolutePath();\r
+        /* Try extracting thelibrary from jar */\r
+        if (extractLibraryFile(sqliteNativeLibraryPath + "/" + sqliteNativeLibraryName, libraryFolder, \r
                 sqliteNativeLibraryName))\r
         {\r
             extracted = true;\r

diff --git a/src/main/resources/native/linux/libsqlitejdbc.so b/src/main/resources/native/linux/libsqlitejdbc.so
index 8ab6098..aa4e403 100755 (executable)
Binary files a/src/main/resources/native/linux/libsqlitejdbc.so and b/src/main/resources/native/linux/libsqlitejdbc.so differ

diff --git a/src/main/resources/native/mac/libsqlitejdbc.jnilib b/src/main/resources/native/mac/libsqlitejdbc.jnilib
index 42d302d..075aea0 100644 (file)
Binary files a/src/main/resources/native/mac/libsqlitejdbc.jnilib and b/src/main/resources/native/mac/libsqlitejdbc.jnilib differ

diff --git a/src/main/resources/native/win/sqlitejdbc.dll b/src/main/resources/native/win/sqlitejdbc.dll
index 00d88dd..550c9ef 100644 (file)
Binary files a/src/main/resources/native/win/sqlitejdbc.dll and b/src/main/resources/native/win/sqlitejdbc.dll differ