(tapestry-5) branch master updated: Removing unintentional change to ClusterTests in master

[thiagohp]

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 74f78cf14 Removing unintentional change to ClusterTests in master
74f78cf14 is described below

commit 74f78cf14a079a15c4dba9abad23299cb6a35dab
Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br>
AuthorDate: Sat Nov 2 16:46:01 2024 -0300

    Removing unintentional change to ClusterTests in master
---
 .../integration/cluster/ClusterTests.java          | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

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 3b6f5f697..7e52ff03a 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,8 +23,9 @@ 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.JDBCSessionIdManager;
-import org.eclipse.jetty.server.session.JDBCSessionManager;
+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.SessionHandler;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.openqa.selenium.firefox.FirefoxDriver;
@@ -196,23 +197,18 @@ public class ClusterTests
 
         runner.configure("src/test/cluster", "", port, port + 100);
 
-        JDBCSessionIdManager idMgr = new 
JDBCSessionIdManager(runner.getServer());
-        idMgr.setWorkerName(name);
-        idMgr.setDriverInfo("org.hsqldb.jdbcDriver", 
"jdbc:hsqldb:mem:clustertest");
+        JDBCSessionDataStore jdbcSessionDataStore = new JDBCSessionDataStore();
+        DatabaseAdaptor databaseAdaptor = new DatabaseAdaptor();
+        databaseAdaptor.setDriverInfo("org.hsqldb.jdbcDriver", 
"jdbc:hsqldb:mem:clustertest");
+        jdbcSessionDataStore.setDatabaseAdaptor(databaseAdaptor);
 
         Server server = runner.getServer();
-        server.setSessionIdManager(idMgr);
+        server.setSessionIdManager(new DefaultSessionIdManager(server));
 
         WebAppContext wac = (WebAppContext) server.getHandler();
 
-        JDBCSessionManager jdbcMgr = new JDBCSessionManager();
-        jdbcMgr.setIdManager(server.getSessionIdManager());
+        server.addBean(jdbcSessionDataStore);
 
-        // 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;