fix: Split HSQLDB connection files to avoid locks - MEED-3281 - #1589 (…

…#1592)

Prior to this change, when a connection leaks or hangs in one
datasource, it affects the access to other datasources while using
HSQLDB. This change will define one database file per Datasource to
avoid such a behavior.

packaging/plf-tomcat-resources/src/main/resources/conf/hsqldb.filters.properties

@@ -20,6 +20,8 @@ validationQueryTimeoutOption=validationQueryTimeout="5"
 driverClassName=org.hsqldb.jdbcDriver
 username=sa
 password=
-url=jdbc:hsqldb:file:\${exo.data.dir}/hsql/exo-plf
+urlIdm=jdbc:hsqldb:file:\${exo.data.dir}/hsql/idm
+urlJpa=jdbc:hsqldb:file:\${exo.data.dir}/hsql/jpa
+urlJcr=jdbc:hsqldb:file:\${exo.data.dir}/hsql/jcr
 connectionParameters=;shutdown=true;hsqldb.write_delay=false;hsqldb.tx=mvcc;
 jpaConnectionParameters=;shutdown=true;hsqldb.write_delay=false;hsqldb.tx=mvcc;

packaging/plf-tomcat-resources/src/main/resources/conf/mysql.filters.properties

@@ -20,6 +20,8 @@ validationQueryTimeoutOption=validationQueryTimeout="5"
 driverClassName=com.mysql.jdbc.Driver
 username=plf
 password=plf
-url=jdbc:mysql://localhost:3306/plf
+urlIdm=jdbc:mysql://localhost:3306/plf
+urlJpa=jdbc:mysql://localhost:3306/plf
+urlJcr=jdbc:mysql://localhost:3306/plf
 connectionParameters=?autoReconnect=true
 jpaConnectionParameters=?autoReconnect=true&characterEncoding=utf8

packaging/plf-tomcat-resources/src/main/resources/conf/postgres.filters.properties

@@ -20,6 +20,8 @@ validationQueryTimeoutOption=validationQueryTimeout="5"
 driverClassName=org.postgresql.Driver
 username=plf
 password=plf
-url=jdbc:postgresql://localhost:5432/plf
+urlIdm=jdbc:postgresql://localhost:5432/plf
+urlJpa=jdbc:postgresql://localhost:5432/plf
+urlJcr=jdbc:postgresql://localhost:5432/plf
 connectionParameters=
 jpaConnectionParameters=

packaging/plf-tomcat-resources/src/main/resources/conf/postgresplus.filters.properties

@@ -20,6 +20,8 @@ validationQueryTimeoutOption=
 driverClassName=com.edb.Driver
 username=plf
 password=plf
-url=jdbc:edb://localhost:5432/plf
+urlIdm=jdbc:edb://localhost:5432/plf
+urlJpa=jdbc:edb://localhost:5432/plf
+urlJcr=jdbc:edb://localhost:5432/plf
 connectionParameters=
 jpaConnectionParameters=

packaging/plf-tomcat-resources/src/main/resources/conf/server.template.xml

@@ -59,7 +59,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
               testWhileIdle="true" testOnBorrow="true" testOnReturn="false"
               timeBetweenEvictionRunsMillis="30000" minEvictableIdleTimeMillis="60000"
               removeAbandonedOnBorrow="true" removeAbandonedOnMaintenance="true" removeAbandonedTimeout="300" logAbandoned="false"
-              username="${username}" password="${password}" driverClassName="${driverClassName}" url="${url}${jpaConnectionParameters}" />
+              username="${username}" password="${password}" driverClassName="${driverClassName}" url="${urlIdm}${jpaConnectionParameters}" />
 
     <!-- eXo JCR Datasource for portal -->
     <Resource name="exo-jcr_portal" auth="Container" type="javax.sql.DataSource"
@@ -69,7 +69,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
               testWhileIdle="true" testOnBorrow="true" testOnReturn="false"
               timeBetweenEvictionRunsMillis="30000" minEvictableIdleTimeMillis="60000"
               removeAbandonedOnBorrow="true" removeAbandonedOnMaintenance="true" removeAbandonedTimeout="300" logAbandoned="false"
-              username="${username}" password="${password}" driverClassName="${driverClassName}" url="${url}${connectionParameters}" />
+              username="${username}" password="${password}" driverClassName="${driverClassName}" url="${urlJcr}${connectionParameters}" />
 
     <!-- eXo JPA Datasource for portal -->
     <Resource name="exo-jpa_portal" auth="Container" type="javax.sql.DataSource"
@@ -79,7 +79,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
               testWhileIdle="true" testOnBorrow="true" testOnReturn="false"
               timeBetweenEvictionRunsMillis="30000" minEvictableIdleTimeMillis="60000"
               removeAbandonedOnBorrow="true" removeAbandonedOnMaintenance="true" removeAbandonedTimeout="300" logAbandoned="false"
-              username="${username}" password="${password}" driverClassName="${driverClassName}" url="${url}${jpaConnectionParameters}" />
+              username="${username}" password="${password}" driverClassName="${driverClassName}" url="${urlJpa}${jpaConnectionParameters}" />
 
   </GlobalNamingResources>