[exo-jcr-commits] exo-jcr SVN: r524 - in jcr/branches/1.12.0-JBC/component/core/src: main/java/org/exoplatform/services/jcr/impl/storage/jdbc and 1 other directories.

Author: areshetnyak Date: 2009-11-09 10:54:36 -0500 (Mon, 09 Nov 2009) New Revision: 524 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java Log: EXOJCR-201 : test JDBCCacheLoadetTest. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-09 15:53:08 UTC (rev 523) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-09 15:54:36 UTC (rev 524) @@ -49,6 +49,7 @@ import org.jboss.cache.Modification; import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig; import org.jboss.cache.factories.annotations.Inject; +import org.jboss.cache.factories.annotations.NonVolatile; import org.jboss.cache.loader.AbstractCacheLoader; import java.util.LinkedHashMap; @@ -67,16 +68,18 @@ */ public class JDBCCacheLoader extends AbstractCacheLoader { - private WorkspaceDataContainer dataContainer; + public JDBCCacheLoader() { + } + /** * Init the loader DataContainer with given WorkspaceDataContainer instance. * * @param dataContainer WorkspaceDataContainer */ @Inject - public void initDataContainer(WorkspaceDataContainer dataContainer) throws RepositoryConfigurationException + public void injectDependencies(WorkspaceDataContainer dataContainer) throws RepositoryConfigurationException { if (this.dataContainer != null) { @@ -86,13 +89,13 @@ this.dataContainer = dataContainer; } - /** * {@inheritDoc} */ public void put(List<Modification> modifications) throws Exception { // TODO + System.out.println(modifications); } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2009-11-09 15:53:08 UTC (rev 523) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2009-11-09 15:54:36 UTC (rev 524) @@ -40,6 +40,7 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.exoplatform.services.naming.InitialContextInitializer; +import org.jboss.cache.factories.annotations.NonVolatile; import org.picocontainer.Startable; import java.io.File; @@ -57,6 +58,7 @@ * @author <a href="mailto:peter.nedonosko@exoplatform.com.ua">Peter Nedonosko</a> * @version $Id:GenericWorkspaceDataContainer.java 13433 2007-03-15 16:07:23Z peterit $ */ +@NonVolatile public class JDBCWorkspaceDataContainer extends WorkspaceDataContainerBase implements Startable { Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java 2009-11-09 15:53:08 UTC (rev 523) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java 2009-11-09 15:54:36 UTC (rev 524) @@ -85,27 +85,32 @@ */ protected void setUp() throws Exception { - super.setUp(); - - // JBossCache - initJBCConfig(); - - cache = new DefaultCacheFactory<Serializable, Object>().createCache(jbcConfig); - - initJBC(); - - // run cache - cache.create(); - cache.start(); - - Node<Serializable, Object> cacheRoot = cache.getRoot(); - - // prepare cache structures - nodes = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.NODES)); - props = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.PROPS)); - - // JCR connection - conn = new JBossCacheStorageConnection(cache, nodes, props); + try { + super.setUp(); + + // JBossCache + initJBCConfig(); + + cache = new DefaultCacheFactory<Serializable, Object>().createCache(jbcConfig, false); + + initJBC(); + + // run cache + cache.create(); + cache.start(); + + Node<Serializable, Object> cacheRoot = cache.getRoot(); + + // prepare cache structures + nodes = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.NODES)); + props = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.PROPS)); + + // JCR connection + conn = new JBossCacheStorageConnection(cache, nodes, props); + } catch (Exception e) { + e.printStackTrace(); + throw e; + } } protected void initJBCConfig() @@ -113,7 +118,7 @@ jbcConfig = "conf/standalone/test-jbosscache-config-jdbcloader.xml"; } - protected void initJBC() + protected void initJBC() throws Exception { // empty here } Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-09 15:53:08 UTC (rev 523) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-09 15:54:36 UTC (rev 524) @@ -18,7 +18,25 @@ */ package org.exoplatform.services.jcr.impl.storage.jbosscache; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import org.exoplatform.services.jcr.config.ContainerEntry; +import org.exoplatform.services.jcr.config.RepositoryEntry; +import org.exoplatform.services.jcr.config.SimpleParameterEntry; +import org.exoplatform.services.jcr.config.WorkspaceEntry; +import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer; +import org.exoplatform.services.jcr.impl.storage.value.StandaloneStoragePluginProvider; +import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; +import org.exoplatform.services.jcr.storage.value.ValueStoragePluginProvider; +import org.exoplatform.services.jcr.util.ConfigurationHelper; +import org.jboss.cache.CacheSPI; + + /** * @author <a href="mailto:reshetnyak.alex@gmail.com">Alex Reshetnyak</a> * @version $Id$ @@ -44,14 +62,32 @@ } @Override - protected void initJBC() + protected void initJBC() throws Exception { // persistence container //WorkspaceDataContainer persistentContainer = new JDBCWorkspaceDataContainerTester(); + + // Create WorkspaceEntry + ConfigurationHelper configurationHelper = ConfigurationHelper.getInstence(); + + ContainerEntry containerEntry = new ContainerEntry(); + List<SimpleParameterEntry> params = new ArrayList<SimpleParameterEntry>(); + params.add(new SimpleParameterEntry(JDBCWorkspaceDataContainer.DB_DIALECT, "hsqldb")); + params.add(new SimpleParameterEntry(JDBCWorkspaceDataContainer.SWAPDIR_PROP, "/target/temp/swap/ws")); + containerEntry.setParameters(params); + + WorkspaceEntry ws = configurationHelper.getNewWs("ws_to_jbdc_cache_loader", true, "data-source", "/target/temp/ws_to_jbdc_cache_loader/lalues", containerEntry); + + RepositoryEntry re = new RepositoryEntry(); + re.addWorkspace(ws); + + ValueStoragePluginProvider valueStoragePluginProvider = new StandaloneStoragePluginProvider(ws); + + JDBCWorkspaceDataContainer persistentContainer = new JDBCWorkspaceDataContainer(ws, re, null, valueStoragePluginProvider); - //((CacheSPI<Serializable, Object>)cache).getComponentRegistry().registerComponent(persistentContainer, - // WorkspaceDataContainer.class); + ((CacheSPI<Serializable, Object>)cache).getComponentRegistry().registerComponent(persistentContainer, + WorkspaceDataContainer.class); } @Override