Tag: cws_src680_hsqldb4 User: fs Date: 05/03/31 01:17:01 Modified: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ StorageFileAccess.java /dba/connectivity/source/drivers/hsqldb/ HDriver.cxx, HStorageAccess.cxx, HStorageMap.cxx, StorageNativeInputStream.cxx, StorageNativeOutputStream.cxx, makefile.mk /dba/connectivity/source/drivers/mozab/ makefile.mk /dba/connectivity/source/drivers/mozab/bootstrap/ makefile.mk /dba/connectivity/source/drivers/mozab/mozillasrc/ makefile.mk /dba/connectivity/source/inc/hsqldb/ HStorageMap.hxx
Log: pseudo-resync to m90, which is not ready yet (and thus not available to real resync) File Changes: Directory: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ ============================================================ File [changed]: StorageFileAccess.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java?r1=1.5&r2=1.5.8.1 Delta lines: +13 -12 --------------------- --- StorageFileAccess.java 18 Mar 2005 09:56:27 -0000 1.5 +++ StorageFileAccess.java 31 Mar 2005 09:16:52 -0000 1.5.8.1 @@ -2,9 +2,9 @@ * * $RCSfile: StorageFileAccess.java,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.8.1 $ * - * last change: $Author: obo $ $Date: 2005/03/18 09:56:27 $ + * last change: $Author: fs $ $Date: 2005/03/31 09:16:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -127,6 +127,7 @@ } public void sync() throws java.io.IOException { + os.sync(); } } 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.9&r2=1.9.4.1 Delta lines: +32 -20 --------------------- --- HDriver.cxx 23 Mar 2005 14:55:02 -0000 1.9 +++ HDriver.cxx 31 Mar 2005 09:16:53 -0000 1.9.4.1 @@ -2,9 +2,9 @@ * * $RCSfile: HDriver.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.4.1 $ * - * last change: $Author: vg $ $Date: 2005/03/23 14:55:02 $ + * last change: $Author: fs $ $Date: 2005/03/31 09:16:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -453,12 +453,12 @@ Reference<XStatement> xStmt = _xConnection->createStatement(); if ( xStmt.is() ) { - Reference<XResultSet> xRes(xStmt->executeQuery(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" SELECT COUNT(*) FROM SYSTEM_SESSIONS WHERE USER_NAME ='SA'"))),UNO_QUERY); + Reference<XResultSet> xRes(xStmt->executeQuery(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT COUNT(*) FROM SYSTEM_SESSIONS WHERE USER_NAME ='SA'"))),UNO_QUERY); Reference<XRow> xRow(xRes,UNO_QUERY); if ( xRow.is() && xRes->next() ) bLastOne = xRow->getInt(1) == 1; if ( bLastOne ) - xStmt->execute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shutdown"))); + xStmt->execute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SHUTDOWN"))); } } } @@ -478,6 +478,8 @@ { ::osl::MutexGuard aGuard(m_aMutex); Reference<XConnection> xCon(Source.Source,UNO_QUERY); + if ( xCon.is() ) + { TWeakPairVector::iterator i = m_aConnections.begin(); for (; m_aConnections.end() != i; ++i) { @@ -487,13 +489,14 @@ break; } } - if ( !xCon.is() ) + } + else { Reference< XStorage> xStorage(Source.Source,UNO_QUERY); if ( xStorage.is() ) { ::rtl::OUString sKey = StorageContainer::getRegisteredKey(xStorage); - i = ::std::find_if(m_aConnections.begin(),m_aConnections.end(),::std::compose1( + TWeakPairVector::iterator i = ::std::find_if(m_aConnections.begin(),m_aConnections.end(),::std::compose1( ::std::bind2nd(::std::equal_to< ::rtl::OUString >(),sKey) ,::std::compose1(::std::select1st<TWeakConnectionPair>(),::std::select2nd< TWeakPair >()))); if ( i != m_aConnections.end() ) @@ -530,6 +533,7 @@ TWeakPairVector::iterator i = ::std::find_if(m_aConnections.begin(),m_aConnections.end(),::std::compose1( ::std::bind2nd(::std::equal_to< ::rtl::OUString >(),sKey) ,::std::compose1(::std::select1st<TWeakConnectionPair>(),::std::select2nd< TWeakPair >()))); + OSL_ENSURE( i != m_aConnections.end(), "ODriverDelegator::preCommit: they're committing a storage which I do not know!" ); if ( i != m_aConnections.end() ) { try @@ -538,14 +542,22 @@ if ( xConnection.is() ) { Reference< XStatement> xStmt = xConnection->createStatement(); + OSL_ENSURE( xStmt.is(), "ODriverDelegator::preCommit: no statement!" ); if ( xStmt.is() ) - { - xStmt->execute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET WRITE_DELAY 2"))); - } + xStmt->execute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SET WRITE_DELAY 0" ) ) ); + + sal_Bool bPreviousAutoCommit = xConnection->getAutoCommit(); + xConnection->setAutoCommit( sal_False ); + xConnection->commit(); + xConnection->setAutoCommit( bPreviousAutoCommit ); + + if ( xStmt.is() ) + xStmt->execute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SET WRITE_DELAY 60" ) ) ); } } catch(Exception&) { + OSL_ENSURE( false, "ODriverDelegator::preCommit: caught an exception!" ); } } } File [changed]: HStorageAccess.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HStorageAccess.cxx?r1=1.5&r2=1.5.4.1 Delta lines: +213 -152 ----------------------- --- HStorageAccess.cxx 23 Mar 2005 09:40:48 -0000 1.5 +++ HStorageAccess.cxx 31 Mar 2005 09:16:53 -0000 1.5.4.1 @@ -2,9 +2,9 @@ * * $RCSfile: HStorageAccess.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.4.1 $ * - * last change: $Author: vg $ $Date: 2005/03/23 09:40:48 $ + * last change: $Author: fs $ $Date: 2005/03/31 09:16:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,7 @@ * * ************************************************************************/ -#include "hsqldb/HStorageAccess.h" +#include "hsqldb/HStorageAccess.hxx" #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> @@ -75,6 +75,10 @@ #include "hsqldb/HStorageMap.hxx" #include "hsqldb/StorageNativeInputStream.h" +#ifndef CONNECTIVITY_HSQLDB_ACCESSLOG_HXX +#include "accesslog.hxx" +#endif + using namespace ::com::sun::star::container; using namespace ::com::sun::star::uno; @@ -97,10 +101,8 @@ { #if OSL_DEBUG_LEVEL > 1 { - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data")); - ::rtl::OString sName = ::rtl::OUStringToOString(sOrgName,RTL_TEXTENCODING_ASCII_US); - getStreams()[sOrgName] = fopen( sName.getStr(), "a+" ); + OperationLogFile( env, name, "data" ).logOperation( "openStream" ); + LogFile( env, name, "data" ).create(); } #endif @@ -123,13 +125,17 @@ xFlush->flush(); } catch(Exception&) - {} + { + OSL_ENSURE( false, "NativeStorageAccess::close: caught an exception while flushing!" ); + } #if OSL_DEBUG_LEVEL > 1 { - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data")); - fclose( getStreams()[sOrgName] ); - getStreams().erase(sOrgName); + OperationLogFile aOpLog( env, name, "data" ); + aOpLog.logOperation( "close" ); + aOpLog.close(); + + LogFile aDataLog( env, name, "data" ); + aDataLog.close(); } #endif @@ -144,9 +150,19 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer (JNIEnv * env, jobject obj_this,jstring name, jstring key) { +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile aOpLog( env, name, "data" ); + aOpLog.logOperation( "getFilePointer" ); +#endif + ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); OSL_ENSURE(pHelper.get(),"No stream helper!"); - return pHelper.get() ? pHelper->getSeek()->getPosition() : jlong(0); + + jlong nReturn = pHelper.get() ? pHelper->getSeek()->getPosition() : jlong(0); +#if OSL_DEBUG_LEVEL > 1 + aOpLog.logReturn( nReturn ); +#endif + return nReturn; } // ----------------------------------------------------------------------------- @@ -158,19 +174,24 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length (JNIEnv * env, jobject obj_this,jstring name, jstring key) { +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile aOpLog( env, name, "data" ); + aOpLog.logOperation( "length" ); +#endif + ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); OSL_ENSURE(pHelper.get(),"No stream helper!"); - return pHelper.get() ? pHelper->getSeek()->getLength() :jlong(0); + + jlong nReturn = pHelper.get() ? pHelper->getSeek()->getLength() :jlong(0); +#if OSL_DEBUG_LEVEL > 1 + aOpLog.logReturn( nReturn ); +#endif + return nReturn; } + // ----------------------------------------------------------------------------- -/* - * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess - * Method: read - * Signature: (Ljava/lang/String;Ljava/lang/String;)I - */ -JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2 - (JNIEnv * env, jobject obj_this,jstring name, jstring key) +jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name, jstring key, DataLogFile* logger ) { ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference< XInputStream>(); @@ -200,27 +221,39 @@ tmpInt = 256 +tmpInt; #if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - if ( getStreams().find(sOrgName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data"))) != getStreams().end() ) - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data")); - else - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".input")); - fputc(tmpInt,getStreams()[sOrgName]); + if ( logger ) + logger->write( tmpInt ); #endif return(tmpInt); } } return -1; } + // ----------------------------------------------------------------------------- /* * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess * Method: read - * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I + * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII - (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len) +JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2 + (JNIEnv* env, jobject obj_this, jstring name, jstring key) +{ +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile aOpLog( env, name, "data" ); + aOpLog.logOperation( "read" ); + + DataLogFile aDataLog( env, name, "data" ); + return read_from_storage_stream( env, obj_this, name, key, &aDataLog ); +#else + return read_from_storage_stream( env, obj_this, name, key ); +#endif +} + +// ----------------------------------------------------------------------------- + +jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len, DataLogFile* logger ) { ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference< XInputStream>(); @@ -253,12 +286,8 @@ env->SetByteArrayRegion(buffer,off,nBytesRead,&aData[0]); #if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - if ( getStreams().find(sOrgName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data"))) != getStreams().end() ) - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data")); - else - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".input")); - fwrite(&aData[0],sizeof(sal_Int8),nBytesRead,getStreams()[sOrgName]); + if ( logger ) + logger->write( aData.getConstArray(), nBytesRead ); #endif return nBytesRead; } @@ -271,12 +300,38 @@ /* * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess + * Method: read + * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I + */ +JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII + (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len) +{ +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile aOpLog( env, name, "data" ); + aOpLog.logOperation( "read( byte[], int, int )" ); + + DataLogFile aDataLog( env, name, "data" ); + return read_from_storage_stream_into_buffer( env, obj_this, name, key, buffer, off, len, &aDataLog ); +#else + return read_from_storage_stream_into_buffer( env, obj_this, name, key, buffer, off, len ); +#endif +} + +// ----------------------------------------------------------------------------- + +/* + * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess * Method: readInt * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt (JNIEnv * env, jobject obj_this,jstring name, jstring key) { +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile aOpLog( env, name, "data" ); + aOpLog.logOperation( "readInt" ); +#endif + ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference< XInputStream>(); OSL_ENSURE(xIn.is(),"Input stream is NULL!"); @@ -318,12 +373,10 @@ } jint nRet = ((ch[0] << 24) + (ch[1] << 16) + (ch[2] << 8) + (ch[3] << 0)); #if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - if ( getStreams().find(sOrgName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data"))) != getStreams().end() ) - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data")); - else - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".input")); - fputc(nRet,getStreams()[sOrgName]); + DataLogFile aDataLog( env, name, "data" ); + aDataLog.write( nRet ); + + aOpLog.logReturn( nRet ); #endif return nRet; } @@ -342,27 +395,28 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek (JNIEnv * env, jobject obj_this,jstring name, jstring key, jlong position) { +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile aOpLog( env, name, "data" ); + aOpLog.logOperation( "seek", position ); +#endif + ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XSeekable> xSeek = pHelper.get() ? pHelper->getSeek() : Reference< XSeekable>(); OSL_ENSURE(xSeek.is(),"No Seekable stream!"); if ( xSeek.is() ) { + #if OSL_DEBUG_LEVEL > 1 + DataLogFile aDataLog( env, name, "data" ); + #endif + ::sal_Int64 nLen = xSeek->getLength(); if ( nLen < position) { static ::sal_Int64 BUFFER_SIZE = 9192; -#if OSL_DEBUG_LEVEL > 1 - { - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - if ( getStreams().find(sOrgName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data"))) != getStreams().end() ) - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data")); - else - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".output")); - int errr = fseek(getStreams()[sOrgName],nLen,SEEK_SET); - } -#endif - + #if OSL_DEBUG_LEVEL > 1 + aDataLog.seek( nLen ); + #endif xSeek->seek(nLen); Reference< XOutputStream> xOut = pHelper->getOutputStream(); OSL_ENSURE(xOut.is(),"No output stream!"); @@ -384,39 +438,23 @@ Sequence< ::sal_Int8 > aData(n); memset(aData.getArray(),0,n); xOut->writeBytes(aData); -#if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - if ( getStreams().find(sOrgName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data"))) != getStreams().end() ) - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data")); - else - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".output")); - fwrite(&aData[0],sizeof(sal_Int8),n,getStreams()[sOrgName]); -#endif + #if OSL_DEBUG_LEVEL > 1 + aDataLog.write( aData.getConstArray(), n ); + #endif } } xSeek->seek(position); OSL_ENSURE(xSeek->getPosition() == position,"Wrong position after seeking the stream"); -#if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - if ( getStreams().find(sOrgName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data"))) != getStreams().end() ) - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data")); - else - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".output")); - int errr = fseek(getStreams()[sOrgName],position,SEEK_SET); - OSL_ENSURE(xSeek->getPosition() == ftell(getStreams()[sOrgName]),"Wrong position after seeking the stream"); -#endif + #if OSL_DEBUG_LEVEL > 1 + aDataLog.seek( position ); + OSL_ENSURE( xSeek->getPosition() == aDataLog.tell(), "Wrong position after seeking the stream" ); + #endif } } // ----------------------------------------------------------------------------- -/* - * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess - * Method: write - * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V - */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write - (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len) +void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, jstring name, jstring key, jbyteArray buffer, jint off, jint len, DataLogFile* logger ) { ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XOutputStream> xOut = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>(); @@ -439,20 +477,12 @@ OSL_ENSURE(buf,"buf is NULL"); if ( buf ) { -#if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - sal_Bool bCheck; - if ( bCheck = (getStreams().find(sOrgName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data"))) != getStreams().end()) ) - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data")); - else - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".output")); -#endif - Sequence< ::sal_Int8 > aData(buf + off,len); xOut->writeBytes(aData); env->ReleaseByteArrayElements(buffer, buf, JNI_ABORT); #if OSL_DEBUG_LEVEL > 1 - fwrite(&aData[off],sizeof(sal_Int8),len,getStreams()[sOrgName]); + if ( logger ) + logger->write( aData.getConstArray(), len ); #endif } } @@ -465,19 +495,34 @@ } catch(Exception& e) { - OSL_ENSURE(0,"Exception catched! : write [BII)V"); + OSL_ENSURE(0,"Exception caught! : write [BII)V"); StorageContainer::throwJavaException(e,env); } } + // ----------------------------------------------------------------------------- /* * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess - * Method: writeInt - * Signature: (Ljava/lang/String;Ljava/lang/String;I)V + * Method: write + * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt - (JNIEnv * env, jobject obj_this,jstring name, jstring key, jint v) +JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write + (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len) +{ +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile aOpLog( env, name, "data" ); + aOpLog.logOperation( "write( byte[], int, int )" ); + + DataLogFile aDataLog( env, name, "data" ); + write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, off, len, &aDataLog ); +#else + write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, off, len ); +#endif +} +// ----------------------------------------------------------------------------- + +void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, jstring key, jint v, DataLogFile* logger ) { ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XOutputStream> xOut = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>(); @@ -494,13 +539,8 @@ xOut->writeBytes(oneByte); #if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - if ( getStreams().find(sOrgName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data"))) != getStreams().end() ) - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".data")); - else - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".output")); - - fwrite(&oneByte[0],sizeof(sal_Int8),4,getStreams()[sOrgName]); + if ( logger ) + logger->write( oneByte.getConstArray(), 4 ); #endif } else @@ -515,4 +555,25 @@ OSL_ENSURE(0,"Exception catched! : writeBytes(aData);"); StorageContainer::throwJavaException(e,env); } +} + +// ----------------------------------------------------------------------------- + +/* + * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess + * Method: writeInt + * Signature: (Ljava/lang/String;Ljava/lang/String;I)V + */ +JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt + (JNIEnv * env, jobject obj_this,jstring name, jstring key, jint v) +{ +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile aOpLog( env, name, "data" ); + aOpLog.logOperation( "writeInt" ); + + DataLogFile aDataLog( env, name, "data" ); + write_to_storage_stream( env, obj_this, name, key, v, &aDataLog ); +#else + write_to_storage_stream( env, obj_this, name, key, v ); +#endif } File [changed]: HStorageMap.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HStorageMap.cxx?r1=1.5&r2=1.5.4.1 Delta lines: +6 -13 -------------------- --- HStorageMap.cxx 23 Mar 2005 09:41:05 -0000 1.5 +++ HStorageMap.cxx 31 Mar 2005 09:16:54 -0000 1.5.4.1 @@ -2,9 +2,9 @@ * * $RCSfile: HStorageMap.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.4.1 $ * - * last change: $Author: vg $ $Date: 2005/03/23 09:41:05 $ + * last change: $Author: fs $ $Date: 2005/03/31 09:16:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -375,10 +375,3 @@ } // namespace connectivity //........................................................................ -#if OSL_DEBUG_LEVEL > 1 -TDebugStreamMap& getStreams() -{ - static TDebugStreamMap streams; - return streams; -} -#endif File [changed]: StorageNativeInputStream.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx?r1=1.4&r2=1.4.4.1 Delta lines: +77 -34 --------------------- --- StorageNativeInputStream.cxx 23 Mar 2005 09:41:37 -0000 1.4 +++ StorageNativeInputStream.cxx 31 Mar 2005 09:16:54 -0000 1.4.4.1 @@ -2,9 +2,9 @@ * * $RCSfile: StorageNativeInputStream.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.4.1 $ * - * last change: $Author: vg $ $Date: 2005/03/23 09:41:37 $ + * last change: $Author: fs $ $Date: 2005/03/31 09:16:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,14 +84,21 @@ #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> #endif -#include "hsqldb/HStorageAccess.h" +#ifndef CONNECTIVITY_HSQLDB_STORAGEACCESS_HXX +#include "hsqldb/HStorageAccess.hxx" +#endif #include "hsqldb/HStorageMap.hxx" #include "hsqldb/StorageNativeInputStream.h" #include "jvmaccess/virtualmachine.hxx" -#include "com/sun/star/lang/XSingleComponentFactory.hpp" +#ifndef _COM_SUN_STAR_LANG_XSINGLECOMPONENTFACTORY_HPP_ +#include <com/sun/star/lang/XSingleComponentFactory.hpp> +#endif + +#ifndef CONNECTIVITY_HSQLDB_ACCESSLOG_HXX +#include "accesslog.hxx" +#endif -#include <rtl/logfile.hxx> #include <limits> @@ -119,10 +126,8 @@ { #if OSL_DEBUG_LEVEL > 1 { - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".input")); - ::rtl::OString sName = ::rtl::OUStringToOString(sOrgName,RTL_TEXTENCODING_ASCII_US); - getStreams()[sOrgName] = fopen( sName.getStr(), "a+" ); + OperationLogFile( env, name, "input" ).logOperation( "openStream" ); + LogFile( env, name, "input" ).create(); } #endif StorageContainer::registerStream(env,name,key,mode); @@ -137,7 +142,14 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv * env, jobject obj_this,jstring key, jstring name) { - return Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2(env,obj_this,name,key); +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile( env, name, "input" ).logOperation( "read()" ); + + DataLogFile aDataLog( env, name, "input" ); + return read_from_storage_stream( env, obj_this, name, key, &aDataLog ); +#else + return read_from_storage_stream( env, obj_this, name, key ); +#endif } // ----------------------------------------------------------------------------- @@ -149,7 +161,14 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray buffer, jint off, jint len) { - return Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII(env,obj_this,name,key,buffer,off,len); +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile( env, name, "input" ).logOperation( "read( byte[], int, int )" ); + + DataLogFile aDataLog( env, name, "input" ); + return read_from_storage_stream_into_buffer( env, obj_this, name, key, buffer, off, len, &aDataLog ); +#else + return read_from_storage_stream_into_buffer(env,obj_this,name,key,buffer,off,len); +#endif } // ----------------------------------------------------------------------------- @@ -162,12 +181,12 @@ (JNIEnv * env, jobject obj_this,jstring key, jstring name) { #if OSL_DEBUG_LEVEL > 1 - { - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".input")); - fclose( getStreams()[sOrgName] ); - getStreams().erase(sOrgName); - } + OperationLogFile aOpLog( env, name, "input" ); + aOpLog.logOperation( "close" ); + aOpLog.close(); + + LogFile aDataLog( env, name, "input" ); + aDataLog.close(); #endif StorageContainer::revokeStream(env,name,key); } @@ -181,6 +200,10 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip (JNIEnv * env, jobject obj_this,jstring key, jstring name, jlong n) { +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile( env, name, "input" ).logOperation( "skip()" ); +#endif + if ( n < 0 ) ThrowException( env, "java/io/IOException", @@ -244,6 +267,11 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available (JNIEnv * env, jobject obj_this,jstring key, jstring name) { +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile aOpLog( env, name, "input" ); + aOpLog.logOperation( "available" ); +#endif + ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); OSL_ENSURE(pHelper.get(),"No stream helper!"); Reference<XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference<XInputStream>(); @@ -251,7 +279,11 @@ { try { - return xIn->available(); + jint nAvailable = xIn->available(); +#if OSL_DEBUG_LEVEL > 1 + aOpLog.logReturn( nAvailable ); +#endif + return nAvailable; } catch(Exception& e) { @@ -277,10 +309,17 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray buffer) { +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile aOpLog( env, name, "input" ); + aOpLog.logOperation( "read( byte[] )" ); + + DataLogFile aDataLog( env, name, "input" ); +#endif + ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference< XInputStream>(); OSL_ENSURE(xIn.is(),"Input stream is NULL!"); - sal_Int32 nBytesRead = 0; + jint nBytesRead = 0; if ( xIn.is() ) { jsize nLen = env->GetArrayLength(buffer); @@ -301,17 +340,21 @@ // must <= len. // if (nBytesRead <= 0) { +#if OSL_DEBUG_LEVEL > 1 + aOpLog.logReturn( (jint)-1 ); +#endif return -1; } OSL_ENSURE(nLen >= nBytesRead,"Buffer is too small!"); OSL_ENSURE(aData.getLength() >= nBytesRead,"Buffer is too small!"); env->SetByteArrayRegion(buffer,0,nBytesRead,&aData[0]); #if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".input")); - fwrite(&aData[0],sizeof(sal_Int8),nBytesRead,getStreams()[sOrgName]); + aDataLog.write( &aData[0], nBytesRead ); #endif } +#if OSL_DEBUG_LEVEL > 1 + aOpLog.logReturn( nBytesRead ); +#endif return nBytesRead; } // ----------------------------------------------------------------------------- File [changed]: StorageNativeOutputStream.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx?r1=1.4&r2=1.4.4.1 Delta lines: +63 -47 --------------------- --- StorageNativeOutputStream.cxx 23 Mar 2005 09:41:52 -0000 1.4 +++ StorageNativeOutputStream.cxx 31 Mar 2005 09:16:55 -0000 1.4.4.1 @@ -2,9 +2,9 @@ * * $RCSfile: StorageNativeOutputStream.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.4.1 $ * - * last change: $Author: vg $ $Date: 2005/03/23 09:41:52 $ + * last change: $Author: fs $ $Date: 2005/03/31 09:16:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,6 +69,10 @@ #include "cppuhelper/compbase1.hxx" #include "cppuhelper/component_context.hxx" +#ifndef CONNECTIVITY_HSQLDB_ACCESSLOG_HXX +#include "accesslog.hxx" +#endif + #ifndef _COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_ #include <com/sun/star/embed/XTransactedObject.hpp> #endif @@ -96,14 +100,12 @@ #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> #endif -#include "hsqldb/HStorageAccess.h" +#include "hsqldb/HStorageAccess.hxx" #include "hsqldb/HStorageMap.hxx" #include "jvmaccess/virtualmachine.hxx" #include "com/sun/star/lang/XSingleComponentFactory.hpp" -#include <rtl/logfile.hxx> - using namespace ::com::sun::star::container; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::document; @@ -130,10 +132,8 @@ { #if OSL_DEBUG_LEVEL > 1 { - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".output")); - ::rtl::OString sName = ::rtl::OUStringToOString(sOrgName,RTL_TEXTENCODING_ASCII_US); - getStreams()[sOrgName] = fopen( sName.getStr(), "a+" ); + OperationLogFile( env, name, "output" ).logOperation( "openStream" ); + LogFile( env, name, "output" ).create(); } #endif StorageContainer::registerStream(env,name,key,mode); @@ -146,7 +146,14 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII (JNIEnv * env, jobject obj_this, jstring key, jstring name, jbyteArray buffer, jint off, jint len) { - Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write(env,obj_this,name,key,buffer,off,len); +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile( env, name, "output" ).logOperation( "write( byte[], int, int )" ); + + DataLogFile aDataLog( env, name, "output" ); + write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, off, len, &aDataLog ); +#else + write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, off, len ); +#endif } // ----------------------------------------------------------------------------- /* @@ -157,7 +164,14 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3B (JNIEnv * env, jobject obj_this, jstring key, jstring name, jbyteArray buffer) { - Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write(env,obj_this,name,key,buffer,0,env->GetArrayLength(buffer)); +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile( env, name, "output" ).logOperation( "write( byte[] )" ); + + DataLogFile aDataLog( env, name, "output" ); + write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, 0, env->GetArrayLength( buffer ), &aDataLog ); +#else + write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, 0, env->GetArrayLength( buffer ) ); +#endif } // ----------------------------------------------------------------------------- /* @@ -168,6 +182,13 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_close (JNIEnv * env, jobject obj_this, jstring key, jstring name) { +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile aOpLog( env, name, "output" ); + aOpLog.logOperation( "close" ); + + LogFile aDataLog( env, name, "output" ); +#endif + ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XOutputStream> xFlush = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>(); if ( xFlush.is() ) @@ -179,12 +200,8 @@ {} #if OSL_DEBUG_LEVEL > 1 - { - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - sOrgName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".output")); - fclose( getStreams()[sOrgName] ); - getStreams().erase(sOrgName); - } + aDataLog.close(); + aOpLog.close(); #endif StorageContainer::revokeStream(env,name,key); } @@ -197,7 +214,14 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2I (JNIEnv * env, jobject obj_this, jstring key, jstring name,jint b) { - Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt(env,obj_this,name,key,b); +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile( env, name, "output" ).logOperation( "write( int )" ); + + DataLogFile aDataLog( env, name, "output" ); + write_to_storage_stream( env, obj_this, name, key, b, &aDataLog ); +#else + write_to_storage_stream( env, obj_this, name, key, b ); +#endif } // ----------------------------------------------------------------------------- /* @@ -208,6 +232,9 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_flush (JNIEnv * env, jobject obj_this, jstring key, jstring name) { +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile( env, name, "output" ).logOperation( "flush" ); +#endif } // ----------------------------------------------------------------------------- /* @@ -218,32 +245,21 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_sync (JNIEnv * env, jobject obj_this, jstring key, jstring name) { - TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); - Reference<XTransactedObject> xTrans(aStoragePair.first.first,UNO_QUERY); - if ( xTrans.is() ) - { - try - { - TStreamMap::iterator aIter = aStoragePair.second.begin(); - TStreamMap::iterator aEnd = aStoragePair.second.end(); - for (;aIter != aEnd ; ++aIter) - { - ::boost::shared_ptr<StreamHelper> pHelper = aIter->second; - Reference< XOutputStream> xFlush = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>(); +#if OSL_DEBUG_LEVEL > 1 + OperationLogFile( env, name, "output" ).logOperation( "sync" ); +#endif + ::boost::shared_ptr< StreamHelper > pStream = StorageContainer::getRegisteredStream( env, name, key ); + Reference< XOutputStream > xFlush = pStream.get() ? pStream->getOutputStream() : Reference< XOutputStream>(); + OSL_ENSURE( xFlush.is(), "StorageNativeOutputStream::sync: could not retrieve an output stream!" ); if ( xFlush.is() ) + { try { xFlush->flush(); } catch(Exception&) - {} - } - xTrans->commit(); - } - catch(Exception& e) { - OSL_ENSURE(0,"Exception catched! : sync();"); - StorageContainer::throwJavaException(e,env); + OSL_ENSURE( false, "StorageNativeOutputStream::sync: could not flush output stream!" ); } } } File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/makefile.mk?r1=1.5&r2=1.5.24.1 Delta lines: +5 -4 ------------------- --- makefile.mk 17 Feb 2005 10:15:18 -0000 1.5 +++ makefile.mk 31 Mar 2005 09:16:55 -0000 1.5.24.1 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.24.1 $ # -# last change: $Author: vg $ $Date: 2005/02/17 10:15:18 $ +# last change: $Author: fs $ $Date: 2005/03/31 09:16:55 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,7 +87,8 @@ $(SLO)$/StorageNativeOutputStream.obj \ $(SLO)$/StorageNativeInputStream.obj \ $(SLO)$/StorageFileAccess.obj \ - $(SLO)$/Hservices.obj + $(SLO)$/Hservices.obj \ + $(SLO)$/accesslog.obj .IF "$(OS)"=="MACOSX" Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/makefile.mk?r1=1.16&r2=1.16.22.1 Delta lines: +6 -5 ------------------- --- makefile.mk 21 Feb 2005 12:24:02 -0000 1.16 +++ makefile.mk 31 Mar 2005 09:16:56 -0000 1.16.22.1 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.16.22.1 $ # -# last change: $Author: vg $ $Date: 2005/02/21 12:24:02 $ +# last change: $Author: fs $ $Date: 2005/03/31 09:16:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -64,11 +64,12 @@ PRJNAME=connectivity TARGET=$(MOZAB_TARGET) TARGET2=$(MOZAB_TARGET)drv -.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "NO" + +.IF "$(.IF "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" all: @echo " Not building the mozabsrc stuff in OpenOffice.org build" @echo " dependency to Mozilla developer snapshots not feasable at the moment" - + @echo " see http://bugzilla.mozilla.org/show_bug.cgi?id=135137"; .ENDIF #mozilla specific stuff. Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk?r1=1.2&r2=1.2.24.1 Delta lines: +3 -3 ------------------- --- makefile.mk 21 Feb 2005 12:29:51 -0000 1.2 +++ makefile.mk 31 Mar 2005 09:16:57 -0000 1.2.24.1 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.24.1 $ # -# last change: $Author: vg $ $Date: 2005/02/21 12:29:51 $ +# last change: $Author: fs $ $Date: 2005/03/31 09:16:57 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -84,7 +84,7 @@ .INCLUDE : settings.mk -.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "NO" +.IF "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" dummy: @echo " Not building the mozillasrc stuff in OpenOffice.org build" Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/makefile.mk?r1=1.14&r2=1.14.22.1 Delta lines: +5 -5 ------------------- --- makefile.mk 21 Feb 2005 12:33:16 -0000 1.14 +++ makefile.mk 31 Mar 2005 09:16:58 -0000 1.14.22.1 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.14.22.1 $ # -# last change: $Author: vg $ $Date: 2005/02/21 12:33:16 $ +# last change: $Author: fs $ $Date: 2005/03/31 09:16:58 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -84,12 +84,12 @@ .INCLUDE : settings.mk -.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "NO" +.IF "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" dummy: @echo " Not building the mozillasrc stuff in OpenOffice.org build" @echo " dependency to Mozilla developer snapshots not feasable at the moment" - + @echo " see http://bugzilla.mozilla.org/show_bug.cgi?id=135137"; .ELSE .INCLUDE : $(PRJ)$/version.mk Directory: /dba/connectivity/source/inc/hsqldb/ =============================================== File [changed]: HStorageMap.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/hsqldb/HStorageMap.hxx?r1=1.5&r2=1.5.4.1 Delta lines: +4 -13 -------------------- --- HStorageMap.hxx 23 Mar 2005 09:42:43 -0000 1.5 +++ HStorageMap.hxx 31 Mar 2005 09:16:58 -0000 1.5.4.1 @@ -2,9 +2,9 @@ * * $RCSfile: HStorageMap.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.4.1 $ * - * last change: $Author: vg $ $Date: 2005/03/23 09:42:43 $ + * last change: $Author: fs $ $Date: 2005/03/31 09:16:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -137,15 +137,6 @@ //........................................................................ //........................................................................ } // namespace connectivity - -#if OSL_DEBUG_LEVEL > 0 -#include <stdio.h> -//#include <process.h> - -DECLARE_STL_USTRINGACCESS_MAP(FILE *,TDebugStreamMap); - -TDebugStreamMap& getStreams(); -#endif //........................................................................ #endif // CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
