From 96e679c973d44459a6af3279589ad45b904dbfe3 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 24 Dec 2013 00:18:03 +0100 Subject: [PATCH] [New] Implemented CACHED mode for Strolch --- .../li/strolch/persistence/impl/XmlPersistenceHandler.java | 7 ++++--- .../persistence/impl/dao/test/AbstractDaoImplTest.java | 6 +++--- src/test/resources/runtime/config/StrolchConfiguration.xml | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/li/strolch/persistence/impl/XmlPersistenceHandler.java b/src/main/java/li/strolch/persistence/impl/XmlPersistenceHandler.java index 34a1d1700..7a9417914 100644 --- a/src/main/java/li/strolch/persistence/impl/XmlPersistenceHandler.java +++ b/src/main/java/li/strolch/persistence/impl/XmlPersistenceHandler.java @@ -23,10 +23,11 @@ import li.strolch.model.Resource; import li.strolch.model.Tags; import li.strolch.persistence.api.OrderDao; import li.strolch.persistence.api.ResourceDao; -import li.strolch.persistence.api.StrolchPersistenceHandler; +import li.strolch.persistence.api.PersistenceHandler; import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.impl.model.OrderContextFactory; import li.strolch.persistence.impl.model.ResourceContextFactory; +import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.agent.ComponentContainerImpl; import li.strolch.runtime.agent.StrolchComponent; import li.strolch.runtime.configuration.ComponentConfiguration; @@ -41,7 +42,7 @@ import ch.eitchnet.xmlpers.api.PersistenceTransaction; * @author Robert von Burg * */ -public class XmlPersistenceHandler extends StrolchComponent implements StrolchPersistenceHandler { +public class XmlPersistenceHandler extends StrolchComponent implements PersistenceHandler { public static final String DB_STORE_PATH = "dbStore/"; //$NON-NLS-1$ private PersistenceManager persistenceManager; @@ -72,7 +73,7 @@ public class XmlPersistenceHandler extends StrolchComponent implements StrolchPe } public StrolchTransaction openTx() { - return openTx(StrolchTransaction.DEFAULT_REALM); + return openTx(StrolchConstants.DEFAULT_REALM); } @SuppressWarnings("resource") diff --git a/src/test/java/li/strolch/persistence/impl/dao/test/AbstractDaoImplTest.java b/src/test/java/li/strolch/persistence/impl/dao/test/AbstractDaoImplTest.java index 202e886b8..d85e35a03 100644 --- a/src/test/java/li/strolch/persistence/impl/dao/test/AbstractDaoImplTest.java +++ b/src/test/java/li/strolch/persistence/impl/dao/test/AbstractDaoImplTest.java @@ -17,7 +17,7 @@ package li.strolch.persistence.impl.dao.test; import java.io.File; -import li.strolch.persistence.api.StrolchPersistenceHandler; +import li.strolch.persistence.api.PersistenceHandler; import li.strolch.testbase.runtime.RuntimeMock; import org.junit.AfterClass; @@ -32,7 +32,7 @@ public abstract class AbstractDaoImplTest extends RuntimeMock { private static final String RUNTIME_PATH = "target/strolchRuntime/"; //$NON-NLS-1$ private static final String DB_STORE_PATH_DIR = "dbStore"; //$NON-NLS-1$ private static final String CONFIG_SRC = "src/test/resources/runtime/config"; //$NON-NLS-1$ - protected static StrolchPersistenceHandler persistenceHandler; + protected static PersistenceHandler persistenceHandler; @BeforeClass public static void beforeClass() { @@ -44,7 +44,7 @@ public abstract class AbstractDaoImplTest extends RuntimeMock { RuntimeMock.startContainer(rootPath); // initialize the component configuration - persistenceHandler = getContainer().getComponent(StrolchPersistenceHandler.class); + persistenceHandler = getContainer().getComponent(PersistenceHandler.class); } @AfterClass diff --git a/src/test/resources/runtime/config/StrolchConfiguration.xml b/src/test/resources/runtime/config/StrolchConfiguration.xml index 55d52600b..f7dd1f7b4 100644 --- a/src/test/resources/runtime/config/StrolchConfiguration.xml +++ b/src/test/resources/runtime/config/StrolchConfiguration.xml @@ -3,13 +3,13 @@ StrolchPersistenceTest - EMPTY + CACHED true PersistenceHandler - li.strolch.persistence.api.StrolchPersistenceHandler + li.strolch.persistence.api.PersistenceHandler li.strolch.persistence.impl.XmlPersistenceHandler true