Tag: cws_src680_sb83 User: sb Date: 2007-11-22 09:37:09+0000 Added: dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
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 dba/connectivity/source/drivers/hsqldb/HDriver.cxx dba/connectivity/source/drivers/odbc/OFunctions.cxx Log: Merged in CWS sb80. File Changes: Directory: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ ============================================================ File [added]: NativeLibraries.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java?rev=1.1.4.2&content-type=text/vnd.viewcvs-markup Added lines: 0 -------------- 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.96.1 Delta lines: +5 -15 -------------------- --- NativeStorageAccess.java 2007-03-12 10:39:42+0000 1.6 +++ NativeStorageAccess.java 2007-11-22 09:37:05+0000 1.6.96.1 @@ -4,9 +4,9 @@ * * $RCSfile: NativeStorageAccess.java,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.96.1 $ * - * last change: $Author: obo $ $Date: 2007/03/12 10:39:42 $ + * last change: $Author: sb $ $Date: 2007/11/22 09:37:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,20 +45,10 @@ * @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"); - } - // load shared library for JNI code - NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "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&r2=1.9.96.1 Delta lines: +5 -15 -------------------- --- StorageFileAccess.java 2007-03-12 10:40:07+0000 1.9 +++ StorageFileAccess.java 2007-11-22 09:37:05+0000 1.9.96.1 @@ -4,9 +4,9 @@ * * $RCSfile: StorageFileAccess.java,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.96.1 $ * - * last change: $Author: obo $ $Date: 2007/03/12 10:40:07 $ + * last change: $Author: sb $ $Date: 2007/11/22 09:37:05 $ * * 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; /** @@ -48,17 +47,8 @@ * @author oj93728 */ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{ - 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"); - } - // load shared library for JNI code - NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "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&r2=1.4.96.1 Delta lines: +1 -13 -------------------- --- StorageNativeInputStream.java 2007-03-12 10:40:21+0000 1.4 +++ StorageNativeInputStream.java 2007-11-22 09:37:05+0000 1.4.96.1 @@ -5,26 +5,14 @@ */ package com.sun.star.sdbcx.comp.hsqldb; -import com.sun.star.lib.util.NativeLibraryLoader; import com.sun.star.embed.ElementModes; /** * * @author Ocke */ public class StorageNativeInputStream { - static { - // 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"); - } + static { NativeLibraries.load(); } - // load shared library for JNI code - NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "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&r2=1.5.96.1 Delta lines: +2 -13 -------------------- --- StorageNativeOutputStream.java 2007-03-12 10:40:35+0000 1.5 +++ StorageNativeOutputStream.java 2007-11-22 09:37:05+0000 1.5.96.1 @@ -5,28 +5,17 @@ */ package com.sun.star.sdbcx.comp.hsqldb; -import com.sun.star.lib.util.NativeLibraryLoader; import com.sun.star.embed.ElementModes; /** * * @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" ) ) - { - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "msvcr71"); - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "uwinapi"); - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "sal3"); - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "dbtools680mi"); - } - // load shared library for JNI code - NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "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&r2=1.13.96.1 Delta lines: +7 -6 ------------------- --- makefile.mk 2007-03-12 10:40:46+0000 1.13 +++ makefile.mk 2007-11-22 09:37:05+0000 1.13.96.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.13.96.1 $ # -# last change: $Author: obo $ $Date: 2007/03/12 10:40:46 $ +# last change: $Author: sb $ $Date: 2007/11/22 09:37:05 $ # # 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 @@ -60,14 +60,15 @@ StorageFileAccess.java\ StorageNativeInputStream.java\ StorageNativeOutputStream.java\ - FileSystemRuntimeException.java + FileSystemRuntimeException.java\ + NativeLibraries.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) JARCOMPRESS = TRUE JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE) JARTARGET = $(TARGET).jar -JARCLASSPATH = $(JARFILES) +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.34.1 Delta lines: +1 -1 ------------------- --- build.lst 2007-09-13 17:50:01+0000 1.34 +++ build.lst 2007-11-22 09:37:06+0000 1.34.34.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 Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HDriver.cxx?r1=1.24&r2=1.24.36.1 Delta lines: +6 -6 ------------------- --- HDriver.cxx 2007-08-27 16:04:54+0000 1.24 +++ HDriver.cxx 2007-11-22 09:37:06+0000 1.24.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: HDriver.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.24.36.1 $ * - * last change: $Author: vg $ $Date: 2007/08/27 16:04:54 $ + * last change: $Author: sb $ $Date: 2007/11/22 09:37:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -244,10 +244,10 @@ aConvertedProperties[nPos++].Value <<= ::rtl::OUString( #ifdef SYSTEM_HSQLDB RTL_CONSTASCII_USTRINGPARAM(HSQLDB_JAR - " vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar") + " vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/sdbc_hsqldb.jar") #else - RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$ORIGIN/classes/hsqldb.jar" - " vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar") + RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/hsqldb.jar" + " vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/sdbc_hsqldb.jar") #endif ); aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled")); Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OFunctions.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OFunctions.cxx?r1=1.10&r2=1.10.24.1 Delta lines: +6 -11 -------------------- --- OFunctions.cxx 2007-10-15 12:31:13+0000 1.10 +++ OFunctions.cxx 2007-11-22 09:37:06+0000 1.10.24.1 @@ -4,9 +4,9 @@ * * $RCSfile: OFunctions.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.24.1 $ * - * last change: $Author: vg $ $Date: 2007/10/15 12:31:13 $ + * last change: $Author: sb $ $Date: 2007/11/22 09:37:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,8 +112,6 @@ sal_Bool LoadFunctions(oslModule pODBCso); // ------------------------------------------------------------------------- -extern "C" { static void SAL_CALL thisModule() {} } - // Dynamisches Laden der DLL/shared lib und Adressen der Funktionen besorgen: // Liefert sal_True bei Erfolg. sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath) @@ -135,8 +133,7 @@ _rPath = ::rtl::OUString::createFromAscii("libiodbc.dylib"); #else _rPath = ::rtl::OUString::createFromAscii("libodbc.so.1"); - pODBCso = osl_loadModuleRelative( - &thisModule,_rPath.pData,SAL_LOADMODULE_NOW ); + pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); if ( !pODBCso ) _rPath = ::rtl::OUString::createFromAscii("libodbc.so"); #endif /* MACOSX */ @@ -146,15 +143,13 @@ #endif if ( !pODBCso ) - pODBCso = osl_loadModuleRelative( - &thisModule,_rPath.pData,SAL_LOADMODULE_NOW ); + pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); if( !pODBCso) #ifdef OS2 { delete pODBCso; _rPath = ::rtl::OUString::createFromAscii("WOD402"); - pODBCso = osl_loadModuleRelative( - &thisModule,_rPath.pData,SAL_LOADMODULE_NOW ); + pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); if( !pODBCso) return sal_False; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
