From 942e27b6fa60d6fed9c14859b6146aaead9110a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Zara?= <remi.zara@paris.fr>
Date: Mon, 7 Aug 2023 19:40:00 +0200
Subject: [PATCH] LUT-26061: Remove RDBMS drivers jar names from build system

To make the upgrade of RDBMS drivers easier, remove the references to the corresponding jars from the ant script and properties.
Instead, just put the WEB-INF/lib folder into the classpath, so the appropriate driver can be found.
---
 .../build-config/ant/build.properties         |  6 ------
 src/main/resources/build-config/ant/build.xml | 21 +++++--------------
 .../build-config/ant/includes/build-all.xml   |  3 ---
 .../ant/includes/build-oldstructure.xml       |  1 -
 .../ant/includes/build-specific.xml           |  3 ---
 .../ant/includes/build-update.xml             |  2 --
 6 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/main/resources/build-config/ant/build.properties b/src/main/resources/build-config/ant/build.properties
index 1942781..f14046e 100644
--- a/src/main/resources/build-config/ant/build.properties
+++ b/src/main/resources/build-config/ant/build.properties
@@ -17,12 +17,6 @@
 on_sql_error=continue
 db.encoding=utf-8
 
-#Set path of some JDBC connectors
-hsqldb.connector.jar.path=../lib/hsqldb-2.3.4.jar
-mysql.connector.jar.path=../lib/mysql-connector-java-8.0.26.jar
-oracle.connector.jar.path=../lib/ojdbc14-10.2.0.3.0.jar
-postgresql.connector.jar.path=../lib/postgresql-9.4.1211.jar
-
 #Replacement rules for specific DBMS
 # Format is :
 # regexp.${dbms}.list : list of index for each replacement rule, separated by comma
diff --git a/src/main/resources/build-config/ant/build.xml b/src/main/resources/build-config/ant/build.xml
index 703ed9b..15c207b 100644
--- a/src/main/resources/build-config/ant/build.xml
+++ b/src/main/resources/build-config/ant/build.xml
@@ -5,7 +5,6 @@
         <attribute name="sql.url" />
         <attribute name="sql.userid" />
         <attribute name="sql.password" />
-        <attribute name="sql.connector.path" />
         <attribute name="sql.fileset.refid"/>
         <sequential>
             <!--echo message="sql.driver : @{sql.driver}" />
@@ -41,11 +40,15 @@
                  userid="@{sql.userid}"
                  password="@{sql.password}"
                  autocommit="true"
-                 classpath="@{sql.connector.path}"
                  onerror="${on_sql_error}"
                  encoding="${db.encoding}"
             >
                 <fileset file="${temp.sql}"/>
+                <classpath>
+                    <fileset dir="../lib">
+                        <include name="*.jar"/>
+                    </fileset>
+                </classpath>
             </sql>
             <delete file="${temp.sql}" verbose="true" />
         </sequential>
@@ -103,9 +106,6 @@
     <target name="init_mysql" if="mysql">
         <echo message="=> MySQL" />
 
-        <!-- Path to the jar that contain database connector driver -->
-        <property name="db.connector.path" value="${mysql.connector.jar.path}" />
-
         <!-- Define the baseUrl and baseName (drop and create DB) -->
         <property file="${db.properties.path}" />
         <propertyregex property="baseUrl"
@@ -126,9 +126,6 @@
     <target name="init_oracle" if="oracle">
         <echo message="=> Oracle" />
 
-        <!-- Path to the jar that contain database connector driver -->
-        <property name="db.connector.path" value="${oracle.connector.jar.path}" />
-
         <!-- Define the baseUrl and baseName (drop and create DB) -->
         <property file="${db.properties.path}" />
         <propertyregex property="baseUrl"
@@ -149,9 +146,6 @@
     <target name="init_hsqldb" if="hsqldb">
         <echo message="=> HSQLDB" />
 
-        <!-- Path to the jar that contain database connector driver -->
-        <property name="db.connector.path" value="${hsqldb.connector.jar.path}" />
-
         <!-- Define the baseUrl and baseName (drop and create DB) -->
         <property file="${db.properties.path}" />
         <property name="baseUrl" value="${portal.url}" />
@@ -166,9 +160,6 @@
     <target name="init_postgresql" if="postgresql">
         <echo message="=> POSTGRESQL" />
 
-        <!-- Path to the jar that contain database connector driver -->
-        <property name="db.connector.path" value="${postgresql.connector.jar.path}" />
-
         <!-- Define the baseUrl and baseName (drop and create DB) -->
         <property file="${db.properties.path}" />
         <propertyregex property="baseUrl"
@@ -234,7 +225,6 @@
                 sql.url="${baseUrl}"
                 sql.userid="${portal.user}"
                 sql.password="${portal.password}"
-                sql.connector.path="${db.connector.path}"
                 sql.fileset.refid="sql.db.create" />
 
         <delete file="${dbms}.sql" verbose="true" />
@@ -254,7 +244,6 @@
                 sql.url="${portal.url}"
                 sql.userid="${portal.user}"
                 sql.password="${portal.password}"
-                sql.connector.path="${db.connector.path}"
                 sql.fileset.refid="sql.core.files"/>
     </target>
 
diff --git a/src/main/resources/build-config/ant/includes/build-all.xml b/src/main/resources/build-config/ant/includes/build-all.xml
index a84613c..041041b 100644
--- a/src/main/resources/build-config/ant/includes/build-all.xml
+++ b/src/main/resources/build-config/ant/includes/build-all.xml
@@ -32,7 +32,6 @@
                         sql.url="${baseUrlPlugins}"
                         sql.userid="${plugins.user}"
                         sql.password="${plugins.password}"
-                        sql.connector.path="${db.connector.path}"
                         sql.fileset.refid="sql.db.create"
                 />
             </then>
@@ -54,7 +53,6 @@
                         sql.url="${plugins.url}"
                         sql.userid="${plugins.user}"
                         sql.password="${plugins.password}"
-                        sql.connector.path="${db.connector.path}"
                         sql.fileset.refid="sql.plugin.files" />
             </then>
             <else>
@@ -62,7 +60,6 @@
                         sql.url="${portal.url}"
                         sql.userid="${portal.user}"
                         sql.password="${portal.password}"
-                        sql.connector.path="${db.connector.path}"
                         sql.fileset.refid="sql.plugin.files" />
             </else>
         </if>
diff --git a/src/main/resources/build-config/ant/includes/build-oldstructure.xml b/src/main/resources/build-config/ant/includes/build-oldstructure.xml
index 81b0ce8..3284772 100644
--- a/src/main/resources/build-config/ant/includes/build-oldstructure.xml
+++ b/src/main/resources/build-config/ant/includes/build-oldstructure.xml
@@ -14,7 +14,6 @@
                 sql.url="${portal.url}"
                 sql.userid="${portal.user}"
                 sql.password="${portal.password}"
-                sql.connector.path="${db.connector.path}"
                 sql.fileset.refid="sql.plugin.files" />
     </target>
 </project>
diff --git a/src/main/resources/build-config/ant/includes/build-specific.xml b/src/main/resources/build-config/ant/includes/build-specific.xml
index d72c427..e6901dc 100644
--- a/src/main/resources/build-config/ant/includes/build-specific.xml
+++ b/src/main/resources/build-config/ant/includes/build-specific.xml
@@ -70,7 +70,6 @@
                                 sql.url="${baseUrl.pool}"
                                 sql.userid="${@{pool}.user}"
                                 sql.password="${@{pool}.password}"
-                                sql.connector.path="${db.connector.path}"
                                 sql.fileset.refid="sql.db.create"
                         />
 
@@ -81,7 +80,6 @@
                                 sql.url="${@{pool}.url}"
                                 sql.userid="${@{pool}.user}"
                                 sql.password="${@{pool}.password}"
-                                sql.connector.path="${db.connector.path}"
                                 sql.fileset.refid="sql.plugin.files"
                         />
                     </then>
@@ -97,7 +95,6 @@
                                 sql.url="${portal.url}"
                                 sql.userid="${portal.user}"
                                 sql.password="${portal.password}"
-                                sql.connector.path="${db.connector.path}"
                                 sql.fileset.refid="sql.plugin.files"/>
                     </else>
                 </if>
diff --git a/src/main/resources/build-config/ant/includes/build-update.xml b/src/main/resources/build-config/ant/includes/build-update.xml
index 7f11a0c..d68e085 100644
--- a/src/main/resources/build-config/ant/includes/build-update.xml
+++ b/src/main/resources/build-config/ant/includes/build-update.xml
@@ -62,7 +62,6 @@
                                 sql.url="${@{pool}.url}"
                                 sql.userid="${@{pool}.user}"
                                 sql.password="${@{spool}.password}"
-                                sql.classpath="${db.connector.path}"
                                 sql.fileset.refid="sql.plugin.files"
                         />
                     </then>
@@ -78,7 +77,6 @@
                                 sql.url="${portal.url}"
                                 sql.userid="${portal.user}"
                                 sql.password="${portal.password}"
-                                sql.connector.path="${db.connector.path}"
                                 sql.fileset.refid="sql.plugin.files"/>
                     </else>
                 </if>