From 790cbf5035fa88a31f61134df055ee36e0b7788f Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Thu, 1 Dec 2005 01:46:51 +0000 Subject: The HibernateManager is now a regular object instead of a bunch of static methods. Each app will now be creating its own HibernateManager (and therefore separate proxool connection pool) git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@80 09dcff7a-b715-0410-9601-b79a96267cd0 --- orktrack/src/net/sf/oreka/orktrack/OrkTrack.java | 3 ++- orktrack/src/net/sf/oreka/orktrack/PortManager.java | 2 +- orktrack/src/net/sf/oreka/orktrack/ProgramManager.java | 2 +- .../net/sf/oreka/orktrack/messages/MetadataMessage.java | 14 +++++++------- .../src/net/sf/oreka/orktrack/messages/TapeMessage.java | 6 +++--- .../net/sf/oreka/orktrack/messages/UserStateMessage.java | 3 ++- orktrack/src/net/sf/oreka/orktrack/test/PortTest.java | 6 +++--- orktrack/src/net/sf/oreka/orktrack/test/ProgramTest.java | 6 +++--- 8 files changed, 22 insertions(+), 20 deletions(-) (limited to 'orktrack') diff --git a/orktrack/src/net/sf/oreka/orktrack/OrkTrack.java b/orktrack/src/net/sf/oreka/orktrack/OrkTrack.java index 634f19b..c4aacea 100644 --- a/orktrack/src/net/sf/oreka/orktrack/OrkTrack.java +++ b/orktrack/src/net/sf/oreka/orktrack/OrkTrack.java @@ -33,6 +33,7 @@ public class OrkTrack { public static final String APP_NAME = "OrkTrack"; + public static HibernateManager hibernateManager = new HibernateManager(); private static Date lastInMemoryObjectsSync = new Date(0); public OrkTrack() { @@ -56,7 +57,7 @@ public class OrkTrack { ConfigManager.getInstance().load(configFile); try { - HibernateManager.configure(hibernateConfigFile); + hibernateManager.configure(hibernateConfigFile); } catch (Exception e) { log.error("OrkTrack.initialize: Error configuring Hibernate:" + e.getMessage()); diff --git a/orktrack/src/net/sf/oreka/orktrack/PortManager.java b/orktrack/src/net/sf/oreka/orktrack/PortManager.java index 839b9ab..bf2939f 100644 --- a/orktrack/src/net/sf/oreka/orktrack/PortManager.java +++ b/orktrack/src/net/sf/oreka/orktrack/PortManager.java @@ -120,7 +120,7 @@ public class PortManager { Session hbnSession = null; boolean success = false; try { - hbnSession = HibernateManager.getSession(); + hbnSession = OrkTrack.hibernateManager.getSession(); Transaction tx = hbnSession.beginTransaction(); Iterator portFaces = hbnSession.createQuery( diff --git a/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java b/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java index 033c684..c21e688 100644 --- a/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java +++ b/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java @@ -52,7 +52,7 @@ public class ProgramManager { boolean success = false; try { - hbnSession = HibernateManager.getSession(); + hbnSession = OrkTrack.hibernateManager.getSession(); tx = hbnSession.beginTransaction(); List progs = hbnSession.createQuery( diff --git a/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java b/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java index a4c279a..abf37e4 100644 --- a/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java +++ b/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java @@ -13,17 +13,13 @@ package net.sf.oreka.orktrack.messages; -import org.apache.log4j.Logger; -import org.hibernate.Session; -import org.hibernate.Transaction; - -import net.sf.oreka.OrkException; import net.sf.oreka.Direction; -import net.sf.oreka.HibernateManager; +import net.sf.oreka.OrkException; import net.sf.oreka.messages.AsyncMessage; import net.sf.oreka.messages.SimpleResponseMessage; import net.sf.oreka.messages.SyncMessage; import net.sf.oreka.orktrack.LogManager; +import net.sf.oreka.orktrack.OrkTrack; import net.sf.oreka.orktrack.Port; import net.sf.oreka.orktrack.PortManager; import net.sf.oreka.orktrack.ServiceManager; @@ -32,6 +28,10 @@ import net.sf.oreka.persistent.Service; import net.sf.oreka.serializers.OrkSerializer; import net.sf.oreka.serializers.SingleLineSerializer; +import org.apache.log4j.Logger; +import org.hibernate.Session; +import org.hibernate.Transaction; + public class MetadataMessage extends SyncMessage { Logger log = null; @@ -58,7 +58,7 @@ public class MetadataMessage extends SyncMessage { Session session = null; Transaction tx = null; try { - session = HibernateManager.getSession(); + session = OrkTrack.hibernateManager.getSession(); tx = session.beginTransaction(); boolean success = false; diff --git a/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java b/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java index f69454b..1f2fb9a 100644 --- a/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java +++ b/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java @@ -13,13 +13,13 @@ package net.sf.oreka.orktrack.messages; -import net.sf.oreka.OrkException; import net.sf.oreka.Direction; -import net.sf.oreka.HibernateManager; +import net.sf.oreka.OrkException; import net.sf.oreka.messages.AsyncMessage; import net.sf.oreka.messages.SimpleResponseMessage; import net.sf.oreka.messages.SyncMessage; import net.sf.oreka.orktrack.LogManager; +import net.sf.oreka.orktrack.OrkTrack; import net.sf.oreka.orktrack.Port; import net.sf.oreka.orktrack.PortManager; import net.sf.oreka.orktrack.ServiceManager; @@ -69,7 +69,7 @@ public class TapeMessage extends SyncMessage { Transaction tx = null; try { - session = HibernateManager.getSession(); + session = OrkTrack.hibernateManager.getSession(); tx = session.beginTransaction(); SingleLineSerializer ser = new SingleLineSerializer(); diff --git a/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java b/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java index fa8df25..e6cdf12 100644 --- a/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java +++ b/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java @@ -19,6 +19,7 @@ import net.sf.oreka.messages.AsyncMessage; import net.sf.oreka.messages.SimpleResponseMessage; import net.sf.oreka.messages.SyncMessage; import net.sf.oreka.orktrack.LogManager; +import net.sf.oreka.orktrack.OrkTrack; import net.sf.oreka.orktrack.Port; import net.sf.oreka.orktrack.PortManager; import net.sf.oreka.orktrack.UserManager; @@ -53,7 +54,7 @@ public class UserStateMessage extends SyncMessage { try { String comment = ""; boolean success = false; - hbnSession = HibernateManager.getSession(); + hbnSession = OrkTrack.hibernateManager.getSession(); tx = hbnSession.beginTransaction(); // find out user User user = UserManager.instance().getByLoginString(loginString, hbnSession); diff --git a/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java b/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java index ca08581..9c4e30c 100644 --- a/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java +++ b/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java @@ -44,7 +44,7 @@ public class PortTest extends TestCase { junit.textui.TestRunner.run (suite()); } protected void setUp() throws Exception { - OrkTrack.initialize("C:/oreka/log4j.properties", "C:/oreka/hsqldb.hbm.xml", "C:/oreka/orktrack.config.xml"); + OrkTrack.initialize("C:/oreka/orktrack/log4j.properties", "C:/oreka/orktrack/hsqldb.hbm.xml", "C:/oreka/orktrack/orktrack.config.xml"); } public static Test suite() { return new TestSuite(PortTest.class); @@ -188,7 +188,7 @@ public class PortTest extends TestCase { public void testTapeAndMetadataMessage() throws Exception { - Session hbnSession = HibernateManager.getSession(); + Session hbnSession = OrkTrack.hibernateManager.getSession(); Transaction tx = hbnSession.beginTransaction(); Service recService = ServiceManager.retrieveOrCreate("recservice", hbnSession); Service ctiService = ServiceManager.retrieveOrCreate("ctiservice", hbnSession); @@ -258,7 +258,7 @@ public class PortTest extends TestCase { mdStopMsg.process(); // verify database entities. - hbnSession = HibernateManager.getSession(); + hbnSession = OrkTrack.hibernateManager.getSession(); tx = hbnSession.beginTransaction(); long time = ((long)(startTimestamp+3))*1000; GregorianCalendar cal = new GregorianCalendar(); diff --git a/orktrack/src/net/sf/oreka/orktrack/test/ProgramTest.java b/orktrack/src/net/sf/oreka/orktrack/test/ProgramTest.java index 2ea1c31..26325eb 100644 --- a/orktrack/src/net/sf/oreka/orktrack/test/ProgramTest.java +++ b/orktrack/src/net/sf/oreka/orktrack/test/ProgramTest.java @@ -49,7 +49,7 @@ public class ProgramTest extends TestCase { public void test1() throws Exception { - Session hbnSession = HibernateManager.getSession(); + Session hbnSession = OrkTrack.hibernateManager.getSession(); Transaction tx = hbnSession.beginTransaction(); // create a user @@ -77,7 +77,7 @@ public class ProgramTest extends TestCase { seg.setDirection(Direction.IN); seg.setUser(user); - hbnSession = HibernateManager.getSession(); + hbnSession = OrkTrack.hibernateManager.getSession(); tx = hbnSession.beginTransaction(); if (ProgramManager.instance().filterSegmentAgainstAllPrograms(seg, hbnSession)) { hbnSession.save(seg); @@ -86,7 +86,7 @@ public class ProgramTest extends TestCase { hbnSession.close(); // verify result - hbnSession = HibernateManager.getSession(); + hbnSession = OrkTrack.hibernateManager.getSession(); tx = hbnSession.beginTransaction(); RecProgram prog = (RecProgram)hbnSession.load(RecProgram.class, prog1.getId()); assertTrue(prog.getRecordedSoFar() == 1); -- cgit v1.2.3