Tag: cws_src680_sb80 User: sb Date: 2007-11-20 08:35:00+0000 Modified: dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
Log: #i82422# At least on Mac OS X Tiger, System.loadLibrary(hsqldb2) does not find the hsqldb2 library on directory above sdbc_hsqldb.jar, even though .. is on the jar's Class-Path; added NativeLibraries.load to work around that. File Changes: Directory: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ ============================================================ File [changed]: NativeStorageAccess.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java?r1=1.6.88.1&r2=1.6.88.2 Delta lines: +4 -13 -------------------- --- NativeStorageAccess.java 2007-11-19 10:17:00+0000 1.6.88.1 +++ NativeStorageAccess.java 2007-11-20 08:34:57+0000 1.6.88.2 @@ -4,9 +4,9 @@ * * $RCSfile: NativeStorageAccess.java,v $ * - * $Revision: 1.6.88.1 $ + * $Revision: 1.6.88.2 $ * - * last change: $Author: sb $ $Date: 2007/11/19 10:17:00 $ + * last change: $Author: sb $ $Date: 2007/11/20 08:34:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,17 +47,8 @@ import com.sun.star.embed.ElementModes; public class NativeStorageAccess { - static - { - if ( System.getProperty( "os.name" ).startsWith( "Windows" ) ) - { - System.loadLibrary("msvcr71"); - System.loadLibrary("uwinapi"); - System.loadLibrary("sal3"); - } - // load shared library for JNI code - System.loadLibrary("hsqldb2"); - } + static { NativeLibraries.load(); } + /** Creates a new instance of StorageAccess */ public NativeStorageAccess(String name,String _mode,Object key) throws java.io.IOException{ try { File [changed]: StorageFileAccess.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java?r1=1.9.88.1&r2=1.9.88.2 Delta lines: +4 -13 -------------------- --- StorageFileAccess.java 2007-11-19 10:17:00+0000 1.9.88.1 +++ StorageFileAccess.java 2007-11-20 08:34:57+0000 1.9.88.2 @@ -4,9 +4,9 @@ * * $RCSfile: StorageFileAccess.java,v $ * - * $Revision: 1.9.88.1 $ + * $Revision: 1.9.88.2 $ * - * last change: $Author: sb $ $Date: 2007/11/19 10:17:00 $ + * last change: $Author: sb $ $Date: 2007/11/20 08:34:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,17 +47,8 @@ * @author oj93728 */ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{ - static { - if ( System.getProperty( "os.name" ).startsWith( "Windows" ) ) - { - System.loadLibrary("msvcr71"); - System.loadLibrary("uwinapi"); - System.loadLibrary("sal3"); - // System.loadLibrary("dbtools680mi"); - } - // load shared library for JNI code - System.loadLibrary("hsqldb2"); - } + static { NativeLibraries.load(); } + String ds_name; String key; /** Creates a new instance of StorageFileAccess */ File [changed]: StorageNativeInputStream.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java?r1=1.4.88.1&r2=1.4.88.2 Delta lines: +1 -12 -------------------- --- StorageNativeInputStream.java 2007-11-19 10:17:00+0000 1.4.88.1 +++ StorageNativeInputStream.java 2007-11-20 08:34:57+0000 1.4.88.2 @@ -11,19 +11,8 @@ * @author Ocke */ public class StorageNativeInputStream { - static { - // preload shared libraries whichs import lips are linked to hsqldb - if ( System.getProperty( "os.name" ).startsWith( "Windows" ) ) - { - System.loadLibrary("msvcr71"); - System.loadLibrary("uwinapi"); - System.loadLibrary("sal3"); - System.loadLibrary("dbtools680mi"); - } + static { NativeLibraries.load(); } - // load shared library for JNI code - System.loadLibrary("hsqldb2"); - } /** Creates a new instance of StorageNativeInputStream */ public StorageNativeInputStream(String key,String _file) { openStream(key,_file, ElementModes.READ); File [changed]: StorageNativeOutputStream.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java?r1=1.5.88.1&r2=1.5.88.2 Delta lines: +2 -12 -------------------- --- StorageNativeOutputStream.java 2007-11-19 10:17:00+0000 1.5.88.1 +++ StorageNativeOutputStream.java 2007-11-20 08:34:57+0000 1.5.88.2 @@ -11,21 +11,11 @@ * @author oj93728 */ public class StorageNativeOutputStream { + static { NativeLibraries.load(); } + String name; Object key; - static { - // preload shared libraries whichs import lips are linked to jpipe - if ( System.getProperty( "os.name" ).startsWith( "Windows" ) ) - { - System.loadLibrary("msvcr71"); - System.loadLibrary("uwinapi"); - System.loadLibrary("sal3"); - System.loadLibrary("dbtools680mi"); - } - // load shared library for JNI code - System.loadLibrary("hsqldb2"); - } /** Creates a new instance of StorageNativeOutputStream */ public StorageNativeOutputStream(String _name,Object _key) { name = _name; File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk?r1=1.13.88.3&r2=1.13.88.4 Delta lines: +4 -3 ------------------- --- makefile.mk 2007-11-19 10:17:00+0000 1.13.88.3 +++ makefile.mk 2007-11-20 08:34:57+0000 1.13.88.4 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13.88.3 $ +# $Revision: 1.13.88.4 $ # -# last change: $Author: sb $ $Date: 2007/11/19 10:17:00 $ +# last change: $Author: sb $ $Date: 2007/11/20 08:34:57 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -60,7 +60,8 @@ StorageFileAccess.java\ StorageNativeInputStream.java\ StorageNativeOutputStream.java\ - FileSystemRuntimeException.java + FileSystemRuntimeException.java\ + NativeLibraries.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
