Tag: cws_src680_sb80 User: sb Date: 2007-11-19 10:17:03+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 dba/connectivity/prj/build.lst
Log: #i82422# Removed dependency on NativeLibraryLoader (as finding jurt.jar is not trivial in OOo-wo-URE installations). 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&r2=1.6.88.1 Delta lines: +7 -8 ------------------- --- NativeStorageAccess.java 2007-03-12 10:39:42+0000 1.6 +++ NativeStorageAccess.java 2007-11-19 10:17:00+0000 1.6.88.1 @@ -4,9 +4,9 @@ * * $RCSfile: NativeStorageAccess.java,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.88.1 $ * - * last change: $Author: obo $ $Date: 2007/03/12 10:39:42 $ + * last change: $Author: sb $ $Date: 2007/11/19 10:17:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,19 +45,18 @@ * @author oj93728 */ import com.sun.star.embed.ElementModes; -import com.sun.star.lib.util.NativeLibraryLoader; public class NativeStorageAccess { static { if ( System.getProperty( "os.name" ).startsWith( "Windows" ) ) { - NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "msvcr71"); - NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "uwinapi"); - NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "sal3"); + System.loadLibrary("msvcr71"); + System.loadLibrary("uwinapi"); + System.loadLibrary("sal3"); } // load shared library for JNI code - NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "hsqldb2"); + System.loadLibrary("hsqldb2"); } /** Creates a new instance of StorageAccess */ public NativeStorageAccess(String name,String _mode,Object key) throws java.io.IOException{ File [changed]: StorageFileAccess.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java?r1=1.9&r2=1.9.88.1 Delta lines: +8 -9 ------------------- --- StorageFileAccess.java 2007-03-12 10:40:07+0000 1.9 +++ StorageFileAccess.java 2007-11-19 10:17:00+0000 1.9.88.1 @@ -4,9 +4,9 @@ * * $RCSfile: StorageFileAccess.java,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.88.1 $ * - * last change: $Author: obo $ $Date: 2007/03/12 10:40:07 $ + * last change: $Author: sb $ $Date: 2007/11/19 10:17:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,7 +40,6 @@ package com.sun.star.sdbcx.comp.hsqldb; import org.hsqldb.lib.FileAccess; -import com.sun.star.lib.util.NativeLibraryLoader; import org.hsqldb.lib.FileSystemRuntimeException; /** @@ -51,13 +50,13 @@ static { if ( System.getProperty( "os.name" ).startsWith( "Windows" ) ) { - NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "msvcr71"); - NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "uwinapi"); - NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "sal3"); - // NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "dbtools680mi"); + System.loadLibrary("msvcr71"); + System.loadLibrary("uwinapi"); + System.loadLibrary("sal3"); + // System.loadLibrary("dbtools680mi"); } // load shared library for JNI code - NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "hsqldb2"); + System.loadLibrary("hsqldb2"); } String ds_name; String key; File [changed]: StorageNativeInputStream.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java?r1=1.4&r2=1.4.88.1 Delta lines: +5 -6 ------------------- --- StorageNativeInputStream.java 2007-03-12 10:40:21+0000 1.4 +++ StorageNativeInputStream.java 2007-11-19 10:17:00+0000 1.4.88.1 @@ -5,7 +5,6 @@ */ package com.sun.star.sdbcx.comp.hsqldb; -import com.sun.star.lib.util.NativeLibraryLoader; import com.sun.star.embed.ElementModes; /** * @@ -16,14 +15,14 @@ // preload shared libraries whichs import lips are linked to hsqldb if ( System.getProperty( "os.name" ).startsWith( "Windows" ) ) { - NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "msvcr71"); - NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "uwinapi"); - NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "sal3"); - NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "dbtools680mi"); + System.loadLibrary("msvcr71"); + System.loadLibrary("uwinapi"); + System.loadLibrary("sal3"); + System.loadLibrary("dbtools680mi"); } // load shared library for JNI code - NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "hsqldb2"); + System.loadLibrary("hsqldb2"); } /** Creates a new instance of StorageNativeInputStream */ public StorageNativeInputStream(String key,String _file) { File [changed]: StorageNativeOutputStream.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java?r1=1.5&r2=1.5.88.1 Delta lines: +5 -6 ------------------- --- StorageNativeOutputStream.java 2007-03-12 10:40:35+0000 1.5 +++ StorageNativeOutputStream.java 2007-11-19 10:17:00+0000 1.5.88.1 @@ -5,7 +5,6 @@ */ package com.sun.star.sdbcx.comp.hsqldb; -import com.sun.star.lib.util.NativeLibraryLoader; import com.sun.star.embed.ElementModes; /** * @@ -18,14 +17,14 @@ // preload shared libraries whichs import lips are linked to jpipe if ( System.getProperty( "os.name" ).startsWith( "Windows" ) ) { - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "msvcr71"); - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "uwinapi"); - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "sal3"); - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "dbtools680mi"); + System.loadLibrary("msvcr71"); + System.loadLibrary("uwinapi"); + System.loadLibrary("sal3"); + System.loadLibrary("dbtools680mi"); } // load shared library for JNI code - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "hsqldb2"); + System.loadLibrary("hsqldb2"); } /** Creates a new instance of StorageNativeOutputStream */ public StorageNativeOutputStream(String _name,Object _key) { 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.2&r2=1.13.88.3 Delta lines: +4 -6 ------------------- --- makefile.mk 2007-11-14 13:37:02+0000 1.13.88.2 +++ makefile.mk 2007-11-19 10:17:00+0000 1.13.88.3 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13.88.2 $ +# $Revision: 1.13.88.3 $ # -# last change: $Author: sb $ $Date: 2007/11/14 13:37:02 $ +# last change: $Author: sb $ $Date: 2007/11/19 10:17:00 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,7 +45,7 @@ # --- Files -------------------------------------------------------- -JARFILES = jurt.jar unoil.jar +JARFILES = unoil.jar .IF "$(SYSTEM_HSQLDB)" == "YES" XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR) .ELSE @@ -67,9 +67,7 @@ JARCOMPRESS = TRUE JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE) JARTARGET = $(TARGET).jar -JARCLASSPATH = $(JARFILES) ../../ure-link/share/java/jurt.jar - # jurt.jar is included twice, to be found in both plain OOo and in - # OOo-wo-URE (this needs to be cleaned up again in the future) +JARCLASSPATH = $(JARFILES) .. # --- Targets ------------------------------------------------------ .INCLUDE : target.mk Directory: /dba/connectivity/prj/ ================================= File [changed]: build.lst Url: http://dba.openoffice.org/source/browse/dba/connectivity/prj/build.lst?r1=1.34&r2=1.34.26.1 Delta lines: +1 -1 ------------------- --- build.lst 2007-09-13 17:50:01+0000 1.34 +++ build.lst 2007-11-19 10:17:01+0000 1.34.26.1 @@ -1,4 +1,4 @@ -cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper HSQLDB:hsqldb NULL +cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb NULL cn connectivity usr1 - all cn_mkout NULL cn connectivity\inc nmake - all cn_inc NULL cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
