Tag: cws_src680_sb36 User: sb Date: 05/07/14 05:33:08 Modified: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ NativeOutputStreamHelper.java, NativeStorageAccess.java, StorageAccess.java, StorageFileAccess.java, StorageNativeInputStream.java, StorageNativeOutputStream.java, makefile.mk
Log: #i51803# Cleaned up dependencies. File Changes: Directory: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ ============================================================ File [changed]: NativeOutputStreamHelper.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java?r1=1.3&r2=1.3.60.1 Delta lines: +0 -1 ------------------- --- NativeOutputStreamHelper.java 16 Feb 2005 15:47:45 -0000 1.3 +++ NativeOutputStreamHelper.java 14 Jul 2005 12:32:59 -0000 1.3.60.1 @@ -6,7 +6,6 @@ package com.sun.star.sdbcx.comp.hsqldb; -import com.sun.star.embed.XStorage; /** * * @author oj93728 File [changed]: NativeStorageAccess.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java?r1=1.4&r2=1.4.60.1 Delta lines: +7 -16 -------------------- --- NativeStorageAccess.java 16 Feb 2005 15:48:00 -0000 1.4 +++ NativeStorageAccess.java 14 Jul 2005 12:33:00 -0000 1.4.60.1 @@ -2,9 +2,9 @@ * * $RCSfile: NativeStorageAccess.java,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.60.1 $ * - * last change: $Author: vg $ $Date: 2005/02/16 15:48:00 $ + * last change: $Author: sb $ $Date: 2005/07/14 12:33:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,16 +70,7 @@ * * @author oj93728 */ -import com.sun.star.document.XDocumentSubStorageSupplier; import com.sun.star.embed.ElementModes; -import com.sun.star.embed.XStorage; -import com.sun.star.io.XStream; -import com.sun.star.io.XInputStream; -import com.sun.star.io.XOutputStream; -import com.sun.star.io.XSeekable; -import com.sun.star.lang.XComponent; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.beans.NamedValue; import com.sun.star.lib.util.NativeLibraryLoader; public class NativeStorageAccess { @@ -87,12 +78,12 @@ { 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(NativeStorageAccess.class.getClassLoader(), "msvcr71"); + NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "uwinapi"); + NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "sal3"); } // load shared library for JNI code - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "hsqldb2"); + NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "hsqldb2"); } /** Creates a new instance of StorageAccess */ public NativeStorageAccess(String name,String _mode,Object key) throws java.io.IOException{ File [changed]: StorageAccess.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java?r1=1.3&r2=1.3.60.1 Delta lines: +3 -14 -------------------- --- StorageAccess.java 16 Feb 2005 15:48:14 -0000 1.3 +++ StorageAccess.java 14 Jul 2005 12:33:01 -0000 1.3.60.1 @@ -2,9 +2,9 @@ * * $RCSfile: StorageAccess.java,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.60.1 $ * - * last change: $Author: vg $ $Date: 2005/02/16 15:48:14 $ + * last change: $Author: sb $ $Date: 2005/07/14 12:33:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,17 +70,6 @@ * * @author oj93728 */ -import com.sun.star.document.XDocumentSubStorageSupplier; -import com.sun.star.embed.ElementModes; -import com.sun.star.embed.XStorage; -import com.sun.star.io.XStream; -import com.sun.star.io.XInputStream; -import com.sun.star.io.XOutputStream; -import com.sun.star.io.XSeekable; -import com.sun.star.lang.XComponent; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.beans.NamedValue; -// import org.hsqldb.lib.SimpleLog; public class StorageAccess implements org.hsqldb.lib.Storage { String key; File [changed]: StorageFileAccess.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java?r1=1.6&r2=1.6.42.1 Delta lines: +8 -9 ------------------- --- StorageFileAccess.java 30 Mar 2005 11:50:54 -0000 1.6 +++ StorageFileAccess.java 14 Jul 2005 12:33:02 -0000 1.6.42.1 @@ -2,9 +2,9 @@ * * $RCSfile: StorageFileAccess.java,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.42.1 $ * - * last change: $Author: rt $ $Date: 2005/03/30 11:50:54 $ + * last change: $Author: sb $ $Date: 2005/07/14 12:33:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,6 @@ package com.sun.star.sdbcx.comp.hsqldb; import org.hsqldb.lib.FileAccess; -import com.sun.star.embed.XStorage; import com.sun.star.lib.util.NativeLibraryLoader; /** * @@ -76,13 +75,13 @@ static { 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"); + NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "msvcr71"); + NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "uwinapi"); + NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "sal3"); + // NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "dbtools680mi"); } // load shared library for JNI code - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "hsqldb2"); + NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "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.3&r2=1.3.78.1 Delta lines: +5 -5 ------------------- --- StorageNativeInputStream.java 21 Jan 2005 16:37:10 -0000 1.3 +++ StorageNativeInputStream.java 14 Jul 2005 12:33:03 -0000 1.3.78.1 @@ -16,14 +16,14 @@ // preload shared libraries whichs import lips are linked to hsqldb 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"); + NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "msvcr71"); + NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "uwinapi"); + NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "sal3"); + NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "dbtools680mi"); } // load shared library for JNI code - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "hsqldb2"); + NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "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.4&r2=1.4.60.1 Delta lines: +0 -1 ------------------- --- StorageNativeOutputStream.java 16 Feb 2005 15:48:43 -0000 1.4 +++ StorageNativeOutputStream.java 14 Jul 2005 12:33:04 -0000 1.4.60.1 @@ -6,7 +6,6 @@ package com.sun.star.sdbcx.comp.hsqldb; import com.sun.star.lib.util.NativeLibraryLoader; -import com.sun.star.embed.XStorage; import com.sun.star.embed.ElementModes; /** * File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk?r1=1.5&r2=1.5.50.1 Delta lines: +5 -4 ------------------- --- makefile.mk 15 Mar 2005 09:04:54 -0000 1.5 +++ makefile.mk 14 Jul 2005 12:33:04 -0000 1.5.50.1 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.50.1 $ # -# last change: $Author: obo $ $Date: 2005/03/15 09:04:54 $ +# last change: $Author: sb $ $Date: 2005/07/14 12:33:04 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -70,7 +70,7 @@ # --- Files -------------------------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar hsqldb.jar +JARFILES = hsqldb.jar jurt.jar unoil.jar JAVAFILES =\ NativeInputStreamHelper.java\ NativeOutputStreamHelper.java\ @@ -85,6 +85,7 @@ JARCOMPRESS = TRUE JARCLASSDIRS = $(PACKAGE) JARTARGET = $(TARGET).jar +JARCLASSPATH = $(JARFILES) .. # --- Targets ------------------------------------------------------ .INCLUDE : target.mk --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
