Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/PropertyIds.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/PropertyIds.java?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/PropertyIds.java (original) +++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/PropertyIds.java Fri Oct 27 00:47:30 2017 @@ -19,7 +19,7 @@ * *************************************************************/ -package com.sun.star.sdbcx.comp.postgresql.util; +package org.apache.openoffice.comp.sdbc.dbtools.util; public enum PropertyIds { QUERYTIMEOUT(1, "QueryTimeOut"),
Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Resources.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Resources.java?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Resources.java (original) +++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Resources.java Fri Oct 27 00:47:30 2017 @@ -19,7 +19,7 @@ * *************************************************************/ -package com.sun.star.sdbcx.comp.postgresql.util; +package org.apache.openoffice.comp.sdbc.dbtools.util; public class Resources { public static final int STR_COMMON_BASE = 1200; Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/SharedResources.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/SharedResources.java?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/SharedResources.java (original) +++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/SharedResources.java Fri Oct 27 00:47:30 2017 @@ -19,16 +19,16 @@ * *************************************************************/ -package com.sun.star.sdbcx.comp.postgresql.util; +package org.apache.openoffice.comp.sdbc.dbtools.util; import java.util.List; import org.apache.commons.lang3.mutable.MutableObject; import org.apache.commons.lang3.tuple.Pair; +import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper; +import org.apache.openoffice.comp.sdbc.dbtools.comphelper.OfficeResourceBundle; import com.sun.star.lang.NullPointerException; -import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper; -import com.sun.star.sdbcx.comp.postgresql.comphelper.OfficeResourceBundle; import com.sun.star.uno.XComponentContext; /** Modified: openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/StandardSQLState.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/StandardSQLState.java?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/StandardSQLState.java (original) +++ openoffice/trunk/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/StandardSQLState.java Fri Oct 27 00:47:30 2017 @@ -19,7 +19,7 @@ * *************************************************************/ -package com.sun.star.sdbcx.comp.postgresql.util; +package org.apache.openoffice.comp.sdbc.dbtools.util; public enum StandardSQLState { SQL_WRONG_PARAMETER_NUMBER("07001"), Modified: openoffice/trunk/main/connectivity/java/sdbc_postgresql/build.xml URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/sdbc_postgresql/build.xml?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/sdbc_postgresql/build.xml (original) +++ openoffice/trunk/main/connectivity/java/sdbc_postgresql/build.xml Fri Oct 27 00:47:30 2017 @@ -63,19 +63,12 @@ <property name="build.sysclasspath" value="ignore"/> <!-- classpath settings for compile and javadoc tasks --> - <condition property="jar-class-path" value="${COMMONS_LANG_JAR}" else="commons-lang3-3.3.jar"> - <equals arg1="${SYSTEM_APACHE_COMMONS}" arg2="YES"/> - </condition> - <condition property="commons-lang-jar" value="${COMMONS_LANG_JAR}" else="${OUTDIR}/bin/commons-lang3-3.3.jar"> - <equals arg1="${SYSTEM_APACHE_COMMONS}" arg2="YES"/> - </condition> <path id="classpath"> <pathelement location="${OUTDIR}/bin/juh.jar"/> <pathelement location="${OUTDIR}/bin/jurt.jar"/> <pathelement location="${OUTDIR}/bin/ridl.jar"/> <pathelement location="${OUTDIR}/bin/unoil.jar"/> - <!-- 3rd party libs --> - <pathelement location="${commons-lang-jar}"/> + <pathelement location="${out}/class/dbtools/dbtools.jar"/> </path> <!-- name to display in documentation --> @@ -219,7 +212,7 @@ <jar jarfile="${build.class}/${jarname}.jar" basedir="${build.class}"> <manifest> - <attribute name="Class-Path" value="${jar-class-path} juh.jar jurt.jar ridl.jar unoil.jar"/> + <attribute name="Class-Path" value="${jar-class-path} juh.jar jurt.jar ridl.jar unoil.jar dbtools.jar"/> <attribute name="Solar-Version" value="${RSCREVISION}"/> <attribute name="RegistrationClassName" value="com.sun.star.sdbcx.comp.postgresql.PostgresqlDriver"/> <attribute name="Sealed" value="true"/> Copied: openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/DatabaseMetaDataResultSet.java (from r1813370, openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DatabaseMetaDataResultSet.java) URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/DatabaseMetaDataResultSet.java?p2=openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/DatabaseMetaDataResultSet.java&p1=openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DatabaseMetaDataResultSet.java&r1=1813370&r2=1813467&rev=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DatabaseMetaDataResultSet.java (original) +++ openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/DatabaseMetaDataResultSet.java Fri Oct 27 00:47:30 2017 @@ -19,10 +19,13 @@ * *************************************************************/ -package com.sun.star.sdbcx.comp.postgresql.util; +package com.sun.star.sdbcx.comp.postgresql; import java.util.ArrayList; +import org.apache.openoffice.comp.sdbc.dbtools.util.ORowSetValue; +import org.apache.openoffice.comp.sdbc.dbtools.util.StandardSQLState; + import com.sun.star.beans.PropertyVetoException; import com.sun.star.beans.UnknownPropertyException; import com.sun.star.beans.XPropertyChangeListener; @@ -48,7 +51,6 @@ import com.sun.star.sdbc.XRow; import com.sun.star.sdbcx.CompareBookmark; import com.sun.star.sdbcx.XColumnsSupplier; import com.sun.star.sdbcx.XRowLocate; -import com.sun.star.sdbcx.comp.postgresql.PostgresqlResultSetMetaData; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.Date; Modified: openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java (original) +++ openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java Fri Oct 27 00:47:30 2017 @@ -24,13 +24,14 @@ package com.sun.star.sdbcx.comp.postgres import java.util.ArrayList; import java.util.List; +import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OCatalog; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OContainer; + import com.sun.star.container.ElementExistException; import com.sun.star.sdbc.SQLException; import com.sun.star.sdbc.XResultSet; import com.sun.star.sdbc.XRow; -import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.OCatalog; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.OContainer; import com.sun.star.uno.Any; import com.sun.star.uno.UnoRuntime; Modified: openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetadata.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetadata.java?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetadata.java (original) +++ openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetadata.java Fri Oct 27 00:47:30 2017 @@ -23,6 +23,8 @@ package com.sun.star.sdbcx.comp.postgres import java.util.ArrayList; +import org.apache.openoffice.comp.sdbc.dbtools.util.ORowSetValue; + import com.sun.star.lib.uno.helper.WeakBase; import com.sun.star.sdbc.DataType; import com.sun.star.sdbc.SQLException; @@ -30,8 +32,6 @@ import com.sun.star.sdbc.XConnection; import com.sun.star.sdbc.XDatabaseMetaData; import com.sun.star.sdbc.XResultSet; import com.sun.star.sdbc.XRow; -import com.sun.star.sdbcx.comp.postgresql.util.DatabaseMetaDataResultSet; -import com.sun.star.sdbcx.comp.postgresql.util.ORowSetValue; import com.sun.star.uno.UnoRuntime; public class PostgresqlDatabaseMetadata extends WeakBase implements XDatabaseMetaData { Modified: openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java (original) +++ openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java Fri Oct 27 00:47:30 2017 @@ -23,6 +23,10 @@ package com.sun.star.sdbcx.comp.postgres import java.util.ArrayList; +import org.apache.openoffice.comp.sdbc.dbtools.util.Resources; +import org.apache.openoffice.comp.sdbc.dbtools.util.SharedResources; +import org.apache.openoffice.comp.sdbc.dbtools.util.StandardSQLState; + import com.sun.star.beans.PropertyValue; import com.sun.star.lang.XServiceInfo; import com.sun.star.lang.XSingleComponentFactory; @@ -35,9 +39,6 @@ import com.sun.star.sdbc.XDriver; import com.sun.star.sdbc.XDriverManager; import com.sun.star.sdbcx.XDataDefinitionSupplier; import com.sun.star.sdbcx.XTablesSupplier; -import com.sun.star.sdbcx.comp.postgresql.util.Resources; -import com.sun.star.sdbcx.comp.postgresql.util.SharedResources; -import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState; import com.sun.star.uno.Exception; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; Modified: openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java (original) +++ openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java Fri Oct 27 00:47:30 2017 @@ -24,22 +24,23 @@ package com.sun.star.sdbcx.comp.postgres import java.util.List; import java.util.Map; +import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OColumnContainer; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OContainer; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OIndexContainer; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OKey; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OKeyContainer; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OTable; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.SqlTableHelper; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.SqlTableHelper.ColumnDescription; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxTableDescriptor; + import com.sun.star.beans.XPropertySet; import com.sun.star.container.ElementExistException; import com.sun.star.container.NoSuchElementException; import com.sun.star.lang.IndexOutOfBoundsException; import com.sun.star.sdbc.SQLException; import com.sun.star.sdbc.XConnection; -import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.OColumnContainer; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.OContainer; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.OIndexContainer; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.OKey; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.OKeyContainer; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.OTable; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.SqlTableHelper; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.SqlTableHelper.ColumnDescription; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxTableDescriptor; public class PostgresqlTable extends OTable { public PostgresqlTable(XConnection connection, OContainer tables, String name, Modified: openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java (original) +++ openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java Fri Oct 27 00:47:30 2017 @@ -23,6 +23,15 @@ package com.sun.star.sdbcx.comp.postgres import java.util.List; +import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OContainer; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxTableDescriptor; +import org.apache.openoffice.comp.sdbc.dbtools.util.ComposeRule; +import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools; +import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools.NameComponents; +import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds; +import org.apache.openoffice.comp.sdbc.dbtools.util.StandardSQLState; + import com.sun.star.beans.UnknownPropertyException; import com.sun.star.beans.XPropertySet; import com.sun.star.container.ElementExistException; @@ -35,14 +44,6 @@ import com.sun.star.sdbc.XResultSet; import com.sun.star.sdbc.XRow; import com.sun.star.sdbc.XStatement; import com.sun.star.sdbcx.XDrop; -import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.OContainer; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxTableDescriptor; -import com.sun.star.sdbcx.comp.postgresql.util.ComposeRule; -import com.sun.star.sdbcx.comp.postgresql.util.DbTools; -import com.sun.star.sdbcx.comp.postgresql.util.DbTools.NameComponents; -import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds; -import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState; import com.sun.star.uno.Any; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.UnoRuntime; Modified: openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlViews.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlViews.java?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlViews.java (original) +++ openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlViews.java Fri Oct 27 00:47:30 2017 @@ -22,6 +22,17 @@ package com.sun.star.sdbcx.comp.postgres import java.util.List; +import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OContainer; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.OView; +import org.apache.openoffice.comp.sdbc.dbtools.sdbcx.descriptors.SdbcxViewDescriptor; +import org.apache.openoffice.comp.sdbc.dbtools.util.ComposeRule; +import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools; +import org.apache.openoffice.comp.sdbc.dbtools.util.DbTools.NameComponents; +import org.apache.openoffice.comp.sdbc.dbtools.util.Osl; +import org.apache.openoffice.comp.sdbc.dbtools.util.PropertyIds; +import org.apache.openoffice.comp.sdbc.dbtools.util.StandardSQLState; + import com.sun.star.beans.UnknownPropertyException; import com.sun.star.beans.XPropertySet; import com.sun.star.container.ElementExistException; @@ -34,16 +45,6 @@ import com.sun.star.sdbc.XResultSet; import com.sun.star.sdbc.XRow; import com.sun.star.sdbc.XStatement; import com.sun.star.sdbcx.CheckOption; -import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.OContainer; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.OView; -import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxViewDescriptor; -import com.sun.star.sdbcx.comp.postgresql.util.ComposeRule; -import com.sun.star.sdbcx.comp.postgresql.util.DbTools; -import com.sun.star.sdbcx.comp.postgresql.util.DbTools.NameComponents; -import com.sun.star.sdbcx.comp.postgresql.util.Osl; -import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds; -import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState; import com.sun.star.uno.UnoRuntime; public class PostgresqlViews extends OContainer { Modified: openoffice/trunk/main/connectivity/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/prj/build.lst?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/prj/build.lst (original) +++ openoffice/trunk/main/connectivity/prj/build.lst Fri Oct 27 00:47:30 2017 @@ -1,8 +1,9 @@ cn connectivity : shell L10N:l10n comphelper SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg LIBXSLT:libxslt APACHE_COMMONS:apache-commons NULL cn connectivity usr1 - all cn_mkout NULL cn connectivity\inc nmake - all cn_inc NULL -cn connectivity\java\sdbc_hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL -cn connectivity\java\sdbc_postgresql nmake - all cn_postgresqldb cn_dbtools cn_inc NULL +cn connectivity\java\dbtools nmake - all cn_jdbtools cn_inc NULL +cn connectivity\java\sdbc_hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_jdbtools cn_inc NULL +cn connectivity\java\sdbc_postgresql nmake - all cn_postgresqldb cn_dbtools cn_jdbtools cn_inc NULL cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_inc NULL cn connectivity\source\manager nmake - all cn_manager cn_dbtools cn_inc NULL cn connectivity\source\cpool nmake - all cn_cpool cn_dbtools cn_inc NULL Modified: openoffice/trunk/main/connectivity/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/prj/d.lst?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/connectivity/prj/d.lst (original) +++ openoffice/trunk/main/connectivity/prj/d.lst Fri Oct 27 00:47:30 2017 @@ -20,6 +20,7 @@ ..\source\drivers\calc\*.xml %_DEST%\xml%_EXT%\*.xml ..\source\drivers\mysql\*.xml %_DEST%\xml%_EXT%\*.xml ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar +..\%__SRC%\class\dbtools\*.jar %_DEST%\bin%_EXT%\*.jar ..\%__SRC%\class\sdbc_hsqldb\*.jar %_DEST%\bin%_EXT%\*.jar ..\%__SRC%\class\sdbc_postgresql\*.jar %_DEST%\bin%_EXT%\*.jar Modified: openoffice/trunk/main/scp2/source/ooo/file_ooo.scp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_ooo.scp?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/scp2/source/ooo/file_ooo.scp (original) +++ openoffice/trunk/main/scp2/source/ooo/file_ooo.scp Fri Oct 27 00:47:30 2017 @@ -432,6 +432,7 @@ STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, #ifndef SYSTEM_APACHE_COMMONS STD_JAR_FILE( gid_File_Jar_Apache_Commons_Lang, commons-lang3-3.3 ) #endif +STD_JAR_FILE( gid_File_Jar_DbTools_Sdbc, dbtools ) STD_JAR_FILE( gid_File_Jar_PostgreSQL_Sdbc, sdbc_postgresql ) #endif Modified: openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1813467&r1=1813466&r2=1813467&view=diff ============================================================================== --- openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original) +++ openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Fri Oct 27 00:47:30 2017 @@ -87,6 +87,7 @@ Module gid_Module_Root_Files_3 gid_File_Jar_Hsqldb, gid_File_Jar_Hsqldb_Sdbc, gid_File_Jar_Apache_Commons_Lang, + gid_File_Jar_DbTools_Sdbc, gid_File_Jar_PostgreSQL_Sdbc, gid_File_Jar_Accessbridge, gid_File_Jar_Js,
