This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/master by this push:
new 1dd9980c9 TAP5-2796: fixing some failures caused by upgrading HSQLDB
1dd9980c9 is described below
commit 1dd9980c93ffa256ad9c3055c8428b2d291bb79a
Author: Thiago H. de Paula Figueiredo <[email protected]>
AuthorDate: Sat Nov 2 12:47:56 2024 -0300
TAP5-2796: fixing some failures caused by upgrading HSQLDB
---
build.gradle | 4 ++--
.../integration/cluster/ClusterTests.java | 22 +++++++++++++---------
.../src/test/resources/hibernate.cfg.xml | 2 +-
.../src/test/resources/hibernate.cfg.xml | 2 +-
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/build.gradle b/build.gradle
index 791ff055a..9f25ceabd 100755
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ project.ext.versions = [
injectApi: "2.0.1",
annotationApi: "2.0.0",
antlrRuntime: "3.5.3",
- hsqldb: "2.7.3",
+ hsqldb: "2.7.3:jdk8",
snakeyaml: "2.3"
]
@@ -417,7 +417,7 @@ subprojects {
"commons-codec:commons-codec:1.10",
"commons-io:commons-io:${versions.commonsIo}",
"commons-logging:commons-logging:1.1.3",
- "org.hsqldb:hsqldb:2.7.3",
+ "org.hsqldb:hsqldb:${versions.hsqldb}",
"org.antlr:antlr-runtime:${versions.antlrRuntime}",
"org.apache.tomcat:dbcp:6.0.32",
"org.hamcrest:hamcrest-core:1.3",
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/cluster/ClusterTests.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/cluster/ClusterTests.java
index 7e52ff03a..3b6f5f697 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/cluster/ClusterTests.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/cluster/ClusterTests.java
@@ -23,9 +23,8 @@ import io.github.bonigarcia.wdm.managers.FirefoxDriverManager;
import org.apache.tapestry5.test.JettyRunner;
import org.apache.tapestry5.test.TapestryTestConstants;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.session.DatabaseAdaptor;
-import org.eclipse.jetty.server.session.DefaultSessionIdManager;
-import org.eclipse.jetty.server.session.JDBCSessionDataStore;
+import org.eclipse.jetty.server.session.JDBCSessionIdManager;
+import org.eclipse.jetty.server.session.JDBCSessionManager;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.webapp.WebAppContext;
import org.openqa.selenium.firefox.FirefoxDriver;
@@ -197,18 +196,23 @@ public class ClusterTests
runner.configure("src/test/cluster", "", port, port + 100);
- JDBCSessionDataStore jdbcSessionDataStore = new JDBCSessionDataStore();
- DatabaseAdaptor databaseAdaptor = new DatabaseAdaptor();
- databaseAdaptor.setDriverInfo("org.hsqldb.jdbcDriver",
"jdbc:hsqldb:mem:clustertest");
- jdbcSessionDataStore.setDatabaseAdaptor(databaseAdaptor);
+ JDBCSessionIdManager idMgr = new
JDBCSessionIdManager(runner.getServer());
+ idMgr.setWorkerName(name);
+ idMgr.setDriverInfo("org.hsqldb.jdbcDriver",
"jdbc:hsqldb:mem:clustertest");
Server server = runner.getServer();
- server.setSessionIdManager(new DefaultSessionIdManager(server));
+ server.setSessionIdManager(idMgr);
WebAppContext wac = (WebAppContext) server.getHandler();
- server.addBean(jdbcSessionDataStore);
+ JDBCSessionManager jdbcMgr = new JDBCSessionManager();
+ jdbcMgr.setIdManager(server.getSessionIdManager());
+ // force the session to be read from the database with no delay
+ // This is an incorrectly documented feature.
+ jdbcMgr.setSaveInterval(0);
+
+ wac.setSessionHandler(new SessionHandler(jdbcMgr));
wac.getServletContext().setInitParameter("cluster.name", name);
runner.start();
return runner;
diff --git a/tapestry-hibernate-core/src/test/resources/hibernate.cfg.xml
b/tapestry-hibernate-core/src/test/resources/hibernate.cfg.xml
index d02951b94..1340455bd 100644
--- a/tapestry-hibernate-core/src/test/resources/hibernate.cfg.xml
+++ b/tapestry-hibernate-core/src/test/resources/hibernate.cfg.xml
@@ -22,7 +22,7 @@
<hibernate-configuration>
<session-factory>
- <property
name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
+ <property
name="hibernate.connection.driver_class">org.hsqldb.jdbc.JDBCDriver</property>
<property
name="hibernate.connection.url">jdbc:hsqldb:mem:test</property>
<property name="hibernate.connection.username">sa</property>
<property
name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
diff --git a/tapestry-hibernate/src/test/resources/hibernate.cfg.xml
b/tapestry-hibernate/src/test/resources/hibernate.cfg.xml
index 08faacc51..ebdc54aca 100644
--- a/tapestry-hibernate/src/test/resources/hibernate.cfg.xml
+++ b/tapestry-hibernate/src/test/resources/hibernate.cfg.xml
@@ -22,7 +22,7 @@
<hibernate-configuration>
<session-factory>
- <property
name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
+ <property
name="hibernate.connection.driver_class">org.hsqldb.jdbc.JDBCDriver</property>
<property name="hibernate.connection.url">jdbc:hsqldb:mem:test</property>
<property name="hibernate.connection.username">sa</property>
<property
name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
