svn commit: r1814552 [6/6] - in /openoffice/trunk/main: connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/ connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ connectivity/java/sdbc_jdbc/ connectiv...

[damjan]

Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1814552&r1=1814551&r2=1814552&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Wed Nov  8 
04:17:25 2017
@@ -796,7 +796,12 @@ End
 
 #ifdef SOLAR_JAVA
 
-STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
+#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_Jdbc_Sdbc, sdbc_jdbc )
+STD_JAR_FILE( gid_File_Jar_PostgreSQL_Sdbc, sdbc_postgresql )
 
 #endif
 

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=1814552&r1=1814551&r2=1814552&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_ooo.scp Wed Nov  8 04:17:25 2017
@@ -429,14 +429,6 @@ STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc,
 #endif
 
 #ifdef SOLAR_JAVA
-#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
-
-#ifdef SOLAR_JAVA
 File gid_File_Jar_Commonwizards
     TXT_FILE_BODY;
     Name = JARFILENAME(commonwizards);

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=1814552&r1=1814551&r2=1814552&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Wed Nov  8 
04:17:25 2017
@@ -88,6 +88,7 @@ Module gid_Module_Root_Files_3
        gid_File_Jar_Hsqldb_Sdbc,
        gid_File_Jar_Apache_Commons_Lang,
        gid_File_Jar_DbTools_Sdbc,
+       gid_File_Jar_Jdbc_Sdbc,
        gid_File_Jar_PostgreSQL_Sdbc,
        gid_File_Jar_Accessbridge,
        gid_File_Jar_Js,
@@ -326,7 +327,6 @@ Module gid_Module_Root_Files_5
        gid_File_Lib_Localedata_Euro,
        gid_File_Lib_Localedata_Others,
        gid_File_Lib_Hsqldb_2,
-       gid_File_Lib_Jdbc,
        gid_File_Lib_Mcnttype,
        gid_File_Lib_Mysql,
        gid_File_Lib_Odbc,