exo-jcr SVN: r607 - in jcr/branches/1.12.0-JBC/component/core/src: test/java/org/exoplatform/services/jcr/impl/storage/jbosscache and 1 other directory.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2009-11-12 10:43:12 -0500 (Thu, 12 Nov 2009)
New Revision: 607
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/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java
Log:
EXOJCR-201 : The JDBCCacheLoader was changed.
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-12 15:32:31 UTC (rev 606)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-12 15:43:12 UTC (rev 607)
@@ -292,8 +292,8 @@
else if (m.getType() == ModificationType.REMOVE_NODE)
{
if (m.getFqn().size() == 2
- && (m.getFqn().get(1).equals(JBossCacheStorage.NODES)
- || m.getFqn().get(1).equals(JBossCacheStorage.PROPS)))
+ && (m.getFqn().get(0).equals(JBossCacheStorage.NODES)
+ || m.getFqn().get(0).equals(JBossCacheStorage.PROPS)))
{
String id = (String) m.getFqn().get(1);
ItemData removedItemData = jdbcConnection.getItemData(id);
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-12 15:32:31 UTC (rev 606)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-12 15:43:12 UTC (rev 607)
@@ -524,9 +524,28 @@
{
// prepare
-
+ WorkspaceStorageConnection conn = persistentContainer.openConnection();
+
+ String nodeId = IdGenerator.generate();
+ addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, Constants.NT_UNSTRUCTURED, null);
+ conn.commit();
+
+ List<Modification> modifications = new ArrayList<Modification>();
+
+ conn = persistentContainer.openConnection();
+
+ NodeData nodeData = (NodeData) conn.getItemData(nodeId);
+
+ modifications.addAll(removeNode(nodeData));
+
+ loader.put(modifications);
+
// tests it
-
+ conn = persistentContainer.openConnection();
+
+ NodeData removedNodeData = (NodeData) conn.getItemData(nodeData.getIdentifier());
+
+ assertNull(removedNodeData);
}
public void testUpdateProperty() throws Exception
16 years, 8 months
exo-jcr SVN: r606 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2009-11-12 10:32:31 -0500 (Thu, 12 Nov 2009)
New Revision: 606
Modified:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java
Log:
EXOJCR-201 : The JDBCCacheLoader was changed.
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-12 15:31:59 UTC (rev 605)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-12 15:32:31 UTC (rev 606)
@@ -177,8 +177,8 @@
throws IllegalStateException, RepositoryException
{
- if (modification.getFqn().get(1).equals(JBossCacheStorage.NODES) ||
- modification.getFqn().get(1).equals(JBossCacheStorage.PROPS))
+ if (modification.getFqn().get(0).equals(JBossCacheStorage.NODES) ||
+ modification.getFqn().get(0).equals(JBossCacheStorage.PROPS))
{
String identifier = (String) modification.getFqn().get(1);
16 years, 8 months
exo-jcr SVN: r605 - jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2009-11-12 10:31:59 -0500 (Thu, 12 Nov 2009)
New Revision: 605
Modified:
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java
Log:
EXOJCR-201 : The JDBCCacheLoader was changed.
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-12 15:11:56 UTC (rev 604)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-12 15:31:59 UTC (rev 605)
@@ -45,6 +45,7 @@
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.datamodel.QPath;
+import org.exoplatform.services.jcr.datamodel.QPathEntry;
import org.exoplatform.services.jcr.datamodel.ValueData;
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData;
@@ -436,7 +437,7 @@
loader.put(modifications);
- // tests
+ // tests it
NodeData srcNodeData = (NodeData) list.get(0);
WorkspaceStorageConnection conn = persistentContainer.openConnection();
@@ -495,9 +496,28 @@
{
// prepare
-
+ WorkspaceStorageConnection conn = persistentContainer.openConnection();
+
+ String nodeId = IdGenerator.generate();
+ addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, Constants.NT_UNSTRUCTURED, null);
+ conn.commit();
+
+ conn = persistentContainer.openConnection();
+ PropertyData propData = addDbProperty(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, InternalQName.parse("[]prop1"), "_Tesed_VALUE", false);
+ conn.commit();
+
+ List<Modification> modifications = new ArrayList<Modification>();
+
+ modifications.addAll(removeProperty(propData));
+
+ loader.put(modifications);
+
// tests it
-
+ conn = persistentContainer.openConnection();
+
+ PropertyData removedPropertyData = (PropertyData) conn.getItemData(propData.getIdentifier());
+
+ assertNull(removedPropertyData);
}
public void testUpdateNode() throws Exception
@@ -537,7 +557,7 @@
addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, Constants.NT_UNSTRUCTURED, null);
conn.commit();
- // tests
+ // tests it
conn = persistentContainer.openConnection();
NodeData srcNodeData = (NodeData) conn.getItemData(nodeId);
16 years, 8 months
exo-jcr SVN: r604 - kernel/trunk.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2009-11-12 10:11:56 -0500 (Thu, 12 Nov 2009)
New Revision: 604
Modified:
kernel/trunk/pom.xml
Log:
javax.servlet:servlet-api
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2009-11-12 15:03:21 UTC (rev 603)
+++ kernel/trunk/pom.xml 2009-11-12 15:11:56 UTC (rev 604)
@@ -201,7 +201,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>[2.5,)</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
16 years, 8 months
exo-jcr SVN: r602 - in core/trunk: exo.core.component.ldap and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2009-11-12 09:51:33 -0500 (Thu, 12 Nov 2009)
New Revision: 602
Modified:
core/trunk/exo.core.component.ldap/pom.xml
core/trunk/pom.xml
Log:
EXOJCR-235 ldap dependency fixed
Modified: core/trunk/exo.core.component.ldap/pom.xml
===================================================================
--- core/trunk/exo.core.component.ldap/pom.xml 2009-11-12 14:50:26 UTC (rev 601)
+++ core/trunk/exo.core.component.ldap/pom.xml 2009-11-12 14:51:33 UTC (rev 602)
@@ -40,8 +40,8 @@
</dependency>
<dependency>
- <groupId>ldapsdk</groupId>
- <artifactId>ldap</artifactId>
+ <groupId>com.novell.ldap</groupId>
+ <artifactId>jldap</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -63,4 +63,4 @@
</plugins>
</pluginManagement>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-11-12 14:50:26 UTC (rev 601)
+++ core/trunk/pom.xml 2009-11-12 14:51:33 UTC (rev 602)
@@ -219,9 +219,9 @@
</dependency>
<dependency>
- <groupId>ldapsdk</groupId>
- <artifactId>ldap</artifactId>
- <version>4.1</version>
+ <groupId>com.novell.ldap</groupId>
+ <artifactId>jldap</artifactId>
+ <version>4.3</version>
</dependency>
<dependency>
16 years, 8 months
exo-jcr SVN: r601 - jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2009-11-12 09:50:26 -0500 (Thu, 12 Nov 2009)
New Revision: 601
Modified:
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderRuntimeTest.java
Log:
EXOJCR-202: IndexerCacheLoaderRuntimeTest test fixed
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderRuntimeTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderRuntimeTest.java 2009-11-12 14:49:19 UTC (rev 600)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderRuntimeTest.java 2009-11-12 14:50:26 UTC (rev 601)
@@ -16,11 +16,10 @@
*/
package org.exoplatform.services.jcr.impl.storage.jbosscache;
-import junit.framework.TestCase;
-
import org.apache.commons.dbcp.BasicDataSourceFactory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.Hits;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
@@ -29,10 +28,7 @@
import org.exoplatform.services.document.DocumentReaderService;
import org.exoplatform.services.idgenerator.impl.IDGeneratorServiceImpl;
import org.exoplatform.services.jcr.access.AccessControlList;
-import org.exoplatform.services.jcr.config.CacheEntry;
import org.exoplatform.services.jcr.config.ContainerEntry;
-import org.exoplatform.services.jcr.config.LockManagerEntry;
-import org.exoplatform.services.jcr.config.LockPersisterEntry;
import org.exoplatform.services.jcr.config.QueryHandlerEntry;
import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.config.SimpleParameterEntry;
@@ -41,7 +37,9 @@
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
import org.exoplatform.services.jcr.datamodel.InternalQName;
+import org.exoplatform.services.jcr.datamodel.ItemData;
import org.exoplatform.services.jcr.datamodel.NodeData;
+import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.core.LocationFactory;
@@ -50,9 +48,9 @@
import org.exoplatform.services.jcr.impl.core.nodetype.registration.JcrNodeTypeDataPersister;
import org.exoplatform.services.jcr.impl.core.nodetype.registration.NodeTypeDataPersister;
import org.exoplatform.services.jcr.impl.core.query.RepositoryIndexSearcherHolder;
-import org.exoplatform.services.jcr.impl.core.query.SearchManager;
import org.exoplatform.services.jcr.impl.core.query.SearchManagerImpl;
import org.exoplatform.services.jcr.impl.core.query.SystemSearchManagerHolder;
+import org.exoplatform.services.jcr.impl.core.query.cacheloader.IndexerCacheLoader;
import org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex;
import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData;
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
@@ -66,13 +64,9 @@
import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection;
import org.exoplatform.services.jcr.storage.value.ValueStoragePluginProvider;
import org.exoplatform.services.jcr.util.IdGenerator;
-import org.jboss.cache.Cache;
-import org.jboss.cache.CacheSPI;
-import org.jboss.cache.DefaultCacheFactory;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.Node;
+import org.jboss.cache.Modification;
-import java.io.Serializable;
+import java.io.InputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
@@ -80,7 +74,6 @@
import java.util.List;
import java.util.Properties;
-import javax.jcr.PropertyType;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.sql.DataSource;
@@ -93,68 +86,82 @@
* @author <a href="karpenko.sergiy(a)gmail.com">Karpenko Sergiy</a>
* @version $Id: IndexerCacheLoaderRuntimeTest.java 111 2008-11-11 11:11:11Z serg $
*/
-public class IndexerCacheLoaderRuntimeTest extends TestCase
+public class IndexerCacheLoaderRuntimeTest extends AbstractCacheLoaderTest
{
- protected JBossCacheStorageConnection conn;
+ private JDBCWorkspaceDataContainer persistentContainer;
- protected Cache<Serializable, Object> cache;
+ private IndexerCacheLoader loader;
- protected Node<Serializable, Object> nodes;
+ SearchManagerImpl manager;
- protected Node<Serializable, Object> props;
+ public void createNewDataSource(String dataSourceName) throws Exception
+ {
- protected Node<Serializable, Object> session;
+ Properties properties = new Properties();
- protected String jbcConfig;
+ properties.setProperty("driverClassName", "org.hsqldb.jdbcDriver");
+ String newurl = "jdbc:hsqldb:file:target/temp/data/" + dataSourceName;
- JDBCWorkspaceDataContainer persistentContainer;
+ properties.setProperty("url", newurl);
+ properties.setProperty("username", "sa");
+ properties.setProperty("password", "");
+ DataSource bds = BasicDataSourceFactory.createDataSource(properties);
+ if (!newurl.contains("hsqldb"))
+ {
+ createDatabase(bds, dataSourceName);
+ }
- SearchManager manager;
+ new InitialContext().rebind(dataSourceName, bds);
+ }
- /**
- * {@inheritDoc}
- */
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
try
{
super.setUp();
- // JBossCache
- initJBCConfig();
+ initPersistence();
- cache = new DefaultCacheFactory<Serializable, Object>().createCache(jbcConfig, false);
+ loader = new IndexerCacheLoader();
+ loader.injectDependencies(manager);
- initJBC();
+ initJCRRoot();
- // run cache
- cache.create();
- cache.start();
+ // // JBossCache
+ // initJBCConfig();
+ //
+ // cache = new DefaultCacheFactory<Serializable, Object>().createCache(jbcConfig, false);
+ //
+ // initJBC();
- Node<Serializable, Object> cacheRoot = cache.getRoot();
-
- // prepare cache structures
-
- nodes = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.NODES));
- props = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.PROPS));
- session = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.SESSION));
-
- // JCR connection
- conn = new JBossCacheStorageConnection(cache, nodes, props, session);
- // add root (/)
- conn.add(new TransientNodeData(Constants.ROOT_PATH, Constants.ROOT_UUID, 1, Constants.NT_UNSTRUCTURED,
- new InternalQName[0], 0, null, new AccessControlList()));
-
- String propId1 = "rootf111111";
- QPath propPath1 = QPath.makeChildPath(Constants.ROOT_PATH, Constants.JCR_PRIMARYTYPE);
- TransientPropertyData propData1 =
- new TransientPropertyData(propPath1, propId1, 1, PropertyType.NAME, Constants.ROOT_UUID, false);
- propData1.setValue(new TransientValueData(Constants.NT_UNSTRUCTURED));
- conn.add(propData1);
-
- conn.commit();
- ((SearchManagerImpl)manager).start();
+ // // 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));
+ // session = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.SESSION));
+ //
+ // // JCR connection
+ // conn = new JBossCacheStorageConnection(cache, nodes, props, session);
+ // // add root (/)
+ // conn.add(new TransientNodeData(Constants.ROOT_PATH, Constants.ROOT_UUID, 1, Constants.NT_UNSTRUCTURED,
+ // new InternalQName[0], 0, null, new AccessControlList()));
+ //
+ // String propId1 = "rootf111111";
+ // QPath propPath1 = QPath.makeChildPath(Constants.ROOT_PATH, Constants.JCR_PRIMARYTYPE);
+ // TransientPropertyData propData1 =
+ // new TransientPropertyData(propPath1, propId1, 1, PropertyType.NAME, Constants.ROOT_UUID, false);
+ // propData1.setValue(new TransientValueData(Constants.NT_UNSTRUCTURED));
+ // conn.add(propData1);
+ //
+ // conn.commit();
+ manager.start();
}
catch (Exception e)
{
@@ -163,122 +170,264 @@
}
}
- /**
- * {@inheritDoc}
- */
- // protected void tearDown() throws Exception
- // {
- //
- // cache.stop();
- // cache.destroy();
- //
- // super.tearDown();
- // }
-
- protected void initJBC() throws Exception
+ public void testAddNode() throws Exception
{
+ // prepare add node to storage
+ WorkspaceStorageConnection conn = persistentContainer.openConnection();
- // Create WorkspaceEntry
- 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);
+ String node1id = IdGenerator.generate();
+ QPath node1path = QPath.makeChildPath(Constants.ROOT_PATH, "[]node:1");
- // Initialize id generator.
- new IdGenerator(new IDGeneratorServiceImpl());
+ // add root (/) with jcr:primaryType
+ addDbNode(conn, node1path, node1id, Constants.ROOT_UUID, Constants.NT_UNSTRUCTURED);
+ conn.commit();
- // Set system property Context.INITIAL_CONTEXT_FACTORY to initial context.
- System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.exoplatform.services.naming.SimpleContextFactory");
+ List<ItemData> node = this.createNode(node1path, node1id, Constants.NT_UNSTRUCTURED, new InternalQName[0]);
- // Create data source. Will be created new data source to new test.
- String dataSourceName = "jdbcjcr_" + IdGenerator.generate();
- createNewDataSource(dataSourceName);
+ List<Modification> modifications = new ArrayList<Modification>();
- WorkspaceEntry ws =
- getNewWs("ws_to_jbdc_cache_loader", true, dataSourceName, "/target/temp/ws_to_jbdc_cache_loader/values",
- containerEntry);
+ for (ItemData data : node)
+ {
+ if (data.isNode())
+ {
+ modifications.addAll(addNode((NodeData)data));
+ }
+ else
+ {
+ modifications.addAll(addProperty((PropertyData)data));
+ }
+ }
- RepositoryEntry re = new RepositoryEntry();
- re.addWorkspace(ws);
+ loader.put(modifications);
- ValueStoragePluginProvider valueStoragePluginProvider = new StandaloneStoragePluginProvider(ws);
+ // check do we really have node
+ WorkspaceStorageConnection connection = persistentContainer.openConnection();
- persistentContainer = new JDBCWorkspaceDataContainer(ws, re, null, valueStoragePluginProvider);
+ NodeData nd = (NodeData)connection.getItemData(node1id);
+ assertNotNull(nd);
+ assertEquals("[]:1[]node:1", nd.getQPath().getAsString());
- persistentContainer.start();
+ // find node by search engine
+ SearchIndex index = ((SearchIndex)manager.getHandler());
+ IndexReader reader = index.getIndexReader();
- NamespaceRegistryImpl nsReg = new NamespaceRegistryImpl();
- nsReg.start();
- SystemDataContainerHolder<WorkspaceDataContainer> systemDataContainerHolder =
- new SystemDataContainerHolder(persistentContainer);
+ IndexSearcher searcher = new IndexSearcher(reader);
- WorkspacePersistentDataManager itemMgr =
- new JBossCacheWorkspaceDataManager(persistentContainer, systemDataContainerHolder);
+ Query query = new TermQuery(new Term("_:UUID", node1id));
+ Hits hit = searcher.search(query);
+ assertEquals(1, hit.length());
+ }
- RepositoryIndexSearcherHolder indexSearcherHolder = new RepositoryIndexSearcherHolder();
+ // public void testAddProperty() throws Exception
+ // {
+ // // prepare
+ // TransientPropertyData propData =
+ // createProperty(Constants.ROOT_PATH, Constants.ROOT_UUID, Constants.JCR_DATA, "JCR DATA VALUE", false);
+ //
+ // List<Modification> modifications = new ArrayList<Modification>();
+ //
+ // modifications.addAll(addProperty(propData));
+ //
+ // loader.put(modifications);
+ //
+ // // tests it
+ // WorkspaceStorageConnection connection = persistentContainer.openConnection();
+ //
+ // PropertyData destPropData = (PropertyData)connection.getItemData(propData.getIdentifier());
+ //
+ // assertNotNull(destPropData);
+ // assertEquals(propData.getIdentifier(), destPropData.getIdentifier());
+ // assertEquals(propData.getParentIdentifier(), destPropData.getParentIdentifier());
+ // assertEquals(propData.getPersistedVersion(), destPropData.getPersistedVersion());
+ // assertEquals(propData.getType(), destPropData.getType());
+ // assertEquals(propData.getQPath(), destPropData.getQPath());
+ // assertEquals(propData.getValues().size(), destPropData.getValues().size());
+ // assertEquals(1, destPropData.getValues().size());
+ //
+ // ValueData valueData = destPropData.getValues().get(0);
+ // assertEquals("JCR DATA VALUE", new String(valueData.getAsByteArray(), "UTF-8"));
+ //
+ // }
- NodeTypeDataPersister persister = new JcrNodeTypeDataPersister(itemMgr, false);
- NodeTypeDataManager ntReg =
- new NodeTypeDataManagerImpl(re, new LocationFactory(nsReg), nsReg, persister, itemMgr, indexSearcherHolder);
+ /**
+ * Add Property to the connection but doesn't save it.
+ *
+ * @param conn WorkspaceStorageConnection
+ * @param root QPath
+ * @param nodeId String
+ * @param primaryType InternalQName
+ * @throws Exception
+ */
+ private void addDbNode(WorkspaceStorageConnection conn, QPath root, String nodeId, String parentId,
+ InternalQName primaryType) throws Exception
+ {
+ // add root (/)
+ conn.add(new TransientNodeData(root, nodeId, 1, primaryType, new InternalQName[0], 0, parentId,
+ new AccessControlList()));
- SystemSearchManagerHolder parentSearchManager = null;
- DocumentReaderService extractor = null;
- ConfigurationManager cfm = new ConfigurationManagerImpl();
+ // add property (/jcr:primaryType)
+ addDbProperty(conn, root, nodeId, Constants.JCR_PRIMARYTYPE, primaryType, false);
+ }
- manager =
- new SearchManagerImpl(ws.getQueryHandler(), nsReg, ntReg, itemMgr, parentSearchManager, extractor, cfm,
- indexSearcherHolder);
+ /**
+ * Add Property to the connection but doesn't save it.
+ *
+ * @param conn WorkspaceStorageConnection
+ * @param nodePath QPath
+ * @param nodeId String
+ * @param propertyName InternalQName
+ * @param propertyValue Object
+ * @return TransientPropertyData
+ * @throws Exception
+ */
+ private TransientPropertyData addDbProperty(WorkspaceStorageConnection conn, QPath nodePath, String nodeId,
+ InternalQName propertyName, Object propertyValue, boolean multiValued) throws Exception
+ {
+ TransientPropertyData propData = createProperty(nodePath, nodeId, propertyName, propertyValue, multiValued);
- ((CacheSPI<Serializable, Object>)cache).getComponentRegistry().registerComponent(persistentContainer,
- WorkspaceDataContainer.class);
+ conn.add(propData);
- ((CacheSPI<Serializable, Object>)cache).getComponentRegistry().registerComponent(manager, SearchManager.class);
+ return propData;
+ }
+ private void createDatabase(DataSource ds, String dbName) throws SQLException
+ {
+ Connection connection = ds.getConnection();
+ PreparedStatement st = connection.prepareStatement("create database " + dbName);
+ st.executeQuery();
}
- protected void initJBCConfig()
+ /**
+ * Create Node to the connection but doesn't save it.
+ *
+ * @param path QPath
+ * @param nodeId String
+ * @param primaryType InternalQName
+ * @param mixinTypeNames InternalQName
+ * @throws Exception
+ */
+ private List<ItemData> createNode(QPath path, String nodeId, InternalQName primaryType,
+ InternalQName[] mixinTypeNames) throws Exception
{
- jbcConfig = "conf/standalone/test-jbosscache-config-exoloader.xml";
+ List<ItemData> list = new ArrayList<ItemData>();
+
+ // add node
+ list.add(new TransientNodeData(path, nodeId, 1, primaryType, (mixinTypeNames == null ? new InternalQName[0]
+ : null), 0, null, new AccessControlList()));
+
+ // add property (/jcr:primaryType)
+ list.add(createProperty(path, Constants.ROOT_UUID, Constants.JCR_PRIMARYTYPE, primaryType, false));
+
+ return list;
}
- public void testAddNode() throws Exception
+ /**
+ * Create Property.
+ *
+ * @param nodePath QPath
+ * @param nodeId String
+ * @param propertyName InternalQName
+ * @param propertyValue Object
+ * @return TransientPropertyData
+ * @throws Exception
+ */
+ private TransientPropertyData createProperty(QPath nodePath, String nodeId, InternalQName propertyName,
+ Object propertyValue, boolean multiValued) throws Exception
{
- // prepare
- //super.testAddNode();
- String node1id = "111111111111";
- QPath node1path = QPath.makeChildPath(Constants.ROOT_PATH, "[]node:1");
- conn.add(new TransientNodeData(node1path, node1id, 1, Constants.NT_UNSTRUCTURED, new InternalQName[0], 0,
- Constants.ROOT_UUID, new AccessControlList()));
+ String propId = IdGenerator.generate();
+ QPath propPath = QPath.makeChildPath(nodePath, propertyName);
+ TransientPropertyData propData = new TransientPropertyData(propPath, propId, 1, 1, nodeId, multiValued);
- String propId1 = "111111222222";
- QPath propPath1 = QPath.makeChildPath(node1path, Constants.JCR_PRIMARYTYPE);
- TransientPropertyData propData1 =
- new TransientPropertyData(propPath1, propId1, 1, PropertyType.NAME, node1id, false);
- propData1.setValue(new TransientValueData(Constants.NT_UNSTRUCTURED));
- conn.add(propData1);
+ List<Object> values = new ArrayList<Object>();
+ if (multiValued)
+ {
+ if (propertyValue instanceof List)
+ {
+ values.addAll((List<Object>)propertyValue);
+ }
+ else
+ throw new Exception("propertyValue should be a List");
+ }
+ else
+ {
+ values.add(propertyValue);
+ }
- conn.commit();
+ for (Object value : values)
+ {
+ if (value instanceof InternalQName)
+ {
+ propData.setValue(new TransientValueData((InternalQName)value));
+ }
+ else if (value instanceof String)
+ {
+ propData.setValue(new TransientValueData((String)value));
+ }
+ else if (value instanceof InputStream)
+ {
+ propData.setValue(new TransientValueData((InputStream)value));
+ }
+ }
- // check do we really have node
- WorkspaceStorageConnection connection = persistentContainer.openConnection();
+ return propData;
+ }
- NodeData nd = (NodeData)connection.getItemData(node1id);
- assertNotNull(nd);
- assertEquals("[]:1[]node:1", nd.getQPath().getAsString());
+ /**
+ * Delete Property to the connection but doesn't save it.
+ *
+ * @param conn WorkspaceStorageConnection
+ * @param root QPath
+ * @param nodeId String
+ * @param primaryType InternalQName
+ * @throws Exception
+ */
+ private void deleteDbNode(WorkspaceStorageConnection conn, QPath root, String nodeId, InternalQName primaryType)
+ throws Exception
+ {
+ // add property (/jcr:primaryType)
+ addDbProperty(conn, root, Constants.ROOT_UUID, Constants.JCR_PRIMARYTYPE, primaryType, false);
- // find node by search engine
+ // add root (/)
+ conn.delete(new TransientNodeData(root, nodeId, 1, primaryType, new InternalQName[0], 0, null,
+ new AccessControlList()));
+ }
- SearchIndex index = ((SearchIndex)manager.getHandler());
- IndexReader reader = index.getIndexReader();
+ private void deleteJCRRoot() throws Exception
+ {
+ // prepare
+ WorkspaceStorageConnection conn = persistentContainer.openConnection();
- IndexSearcher searcher = new IndexSearcher(reader);
+ // add root (/) with jcr:primaryType
+ addDbNode(conn, Constants.ROOT_PATH, Constants.ROOT_UUID, null, Constants.NT_UNSTRUCTURED);
- Query query = new TermQuery(new Term("", ""));
- searcher.search(query);
+ // add property (/jcr:mixinTypes)
+ List<InternalQName> mixins = new ArrayList<InternalQName>();
+ mixins.add(Constants.MIX_REFERENCEABLE);
+ mixins.add(Constants.EXO_PRIVILEGEABLE);
+ mixins.add(Constants.EXO_OWNEABLE);
+ addDbProperty(conn, Constants.ROOT_PATH, Constants.ROOT_UUID, Constants.JCR_MIXINTYPES, mixins, true);
+ conn.commit();
}
+ private void initJCRRoot() throws Exception
+ {
+ // prepare
+ WorkspaceStorageConnection conn = persistentContainer.openConnection();
+
+ // add root (/) with jcr:primaryType
+ addDbNode(conn, Constants.ROOT_PATH, Constants.ROOT_UUID, null, Constants.NT_UNSTRUCTURED);
+
+ // add property (/jcr:mixinTypes)
+ //List<InternalQName> mixins = new ArrayList<InternalQName>();
+ // mixins.add(Constants.MIX_REFERENCEABLE);
+ // mixins.add(Constants.EXO_PRIVILEGEABLE);
+ // mixins.add(Constants.EXO_OWNEABLE);
+ //addDbProperty(conn, Constants.ROOT_PATH, Constants.ROOT_UUID, Constants.JCR_MIXINTYPES, mixins, true);
+
+ conn.commit();
+ }
+
protected WorkspaceEntry getNewWs(String wsName, boolean isMultiDb, String dsName, String vsPath,
ContainerEntry entry) throws Exception
{
@@ -332,66 +481,98 @@
}
+ WorkspaceEntry workspaceEntry =
+ new WorkspaceEntry(wsName != null ? wsName : IdGenerator.generate(), "nt:unstructured");
+ workspaceEntry.setContainer(containerEntry);
+
// Indexer
ArrayList qParams = new ArrayList();
qParams.add(new SimpleParameterEntry("indexDir", "target/temp/index/db1/ws" + IdGenerator.generate()));
QueryHandlerEntry qEntry =
new QueryHandlerEntry("org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex", qParams);
+ workspaceEntry.setQueryHandler(qEntry);
- WorkspaceEntry workspaceEntry =
- new WorkspaceEntry(wsName != null ? wsName : IdGenerator.generate(), "nt:unstructured");
- workspaceEntry.setContainer(containerEntry);
+ // ArrayList cacheParams = new ArrayList();
+ //
+ // cacheParams.add(new SimpleParameterEntry("maxSize", "2000"));
+ // cacheParams.add(new SimpleParameterEntry("liveTime", "20m"));
+ // CacheEntry cacheEntry = new CacheEntry(cacheParams);
+ // cacheEntry.setType("org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl");
+ //
+ // workspaceEntry.setCache(cacheEntry);
- ArrayList cacheParams = new ArrayList();
+ // LockManagerEntry lockManagerEntry = new LockManagerEntry();
+ // lockManagerEntry.setTimeout(900000);
+ // LockPersisterEntry persisterEntry = new LockPersisterEntry();
+ // persisterEntry.setType("org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister");
+ // ArrayList lpParams = new ArrayList();
+ // lpParams.add(new SimpleParameterEntry("path", "../temp/lock"));
+ // persisterEntry.setParameters(lpParams);
+ // lockManagerEntry.setPersister(persisterEntry);
+ // workspaceEntry.setLockManager(lockManagerEntry);
- cacheParams.add(new SimpleParameterEntry("maxSize", "2000"));
- cacheParams.add(new SimpleParameterEntry("liveTime", "20m"));
- CacheEntry cacheEntry = new CacheEntry(cacheParams);
- cacheEntry.setType("org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl");
-
- workspaceEntry.setCache(cacheEntry);
-
- workspaceEntry.setQueryHandler(qEntry);
-
- LockManagerEntry lockManagerEntry = new LockManagerEntry();
- lockManagerEntry.setTimeout(900000);
- LockPersisterEntry persisterEntry = new LockPersisterEntry();
- persisterEntry.setType("org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister");
- ArrayList lpParams = new ArrayList();
- lpParams.add(new SimpleParameterEntry("path", "../temp/lock"));
- persisterEntry.setParameters(lpParams);
- lockManagerEntry.setPersister(persisterEntry);
- workspaceEntry.setLockManager(lockManagerEntry);
-
// workspaceEntry
return workspaceEntry;
}
- public void createNewDataSource(String dataSourceName) throws Exception
+ protected void initPersistence() throws Exception
{
+ // Create WorkspaceEntry
+ 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);
- Properties properties = new Properties();
+ // Initialize id generator.
+ new IdGenerator(new IDGeneratorServiceImpl());
- properties.setProperty("driverClassName", "org.hsqldb.jdbcDriver");
- String newurl = "jdbc:hsqldb:file:target/temp/data/" + dataSourceName;
+ // Set system property Context.INITIAL_CONTEXT_FACTORY to initial context.
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.exoplatform.services.naming.SimpleContextFactory");
- properties.setProperty("url", newurl);
- properties.setProperty("username", "sa");
- properties.setProperty("password", "");
- DataSource bds = BasicDataSourceFactory.createDataSource(properties);
- if (!newurl.contains("hsqldb"))
- {
- createDatabase(bds, dataSourceName);
- }
+ // Create data source. Will be created new data source to new test.
+ String dataSourceName = "jdbcjcr_" + IdGenerator.generate();
+ createNewDataSource(dataSourceName);
- new InitialContext().rebind(dataSourceName, bds);
+ WorkspaceEntry ws =
+ getNewWs("ws_to_jbdc_cache_loader", true, dataSourceName, "/target/temp/ws_to_jbdc_cache_loader/lalues",
+ containerEntry);
+
+ RepositoryEntry re = new RepositoryEntry();
+ re.addWorkspace(ws);
+
+ ValueStoragePluginProvider valueStoragePluginProvider = new StandaloneStoragePluginProvider(ws);
+
+ persistentContainer = new JDBCWorkspaceDataContainer(ws, re, null, valueStoragePluginProvider);
+
+ NamespaceRegistryImpl nsReg = new NamespaceRegistryImpl();
+ nsReg.start();
+ SystemDataContainerHolder<WorkspaceDataContainer> systemDataContainerHolder =
+ new SystemDataContainerHolder(persistentContainer);
+
+ WorkspacePersistentDataManager itemMgr =
+ new JBossCacheWorkspaceDataManager(persistentContainer, systemDataContainerHolder);
+
+ RepositoryIndexSearcherHolder indexSearcherHolder = new RepositoryIndexSearcherHolder();
+
+ NodeTypeDataPersister persister = new JcrNodeTypeDataPersister(itemMgr, false);
+ NodeTypeDataManager ntReg =
+ new NodeTypeDataManagerImpl(re, new LocationFactory(nsReg), nsReg, persister, itemMgr, indexSearcherHolder);
+
+ SystemSearchManagerHolder parentSearchManager = null;
+ DocumentReaderService extractor = null;
+ ConfigurationManager cfm = new ConfigurationManagerImpl();
+
+ manager =
+ new SearchManagerImpl(ws.getQueryHandler(), nsReg, ntReg, itemMgr, parentSearchManager, extractor, cfm,
+ indexSearcherHolder);
}
- private void createDatabase(DataSource ds, String dbName) throws SQLException
+ @Override
+ protected void tearDown() throws Exception
{
- Connection connection = ds.getConnection();
- PreparedStatement st = connection.prepareStatement("create database " + dbName);
- st.executeQuery();
+ // delete all in DB
+ super.tearDown();
}
}
16 years, 8 months
exo-jcr SVN: r600 - jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2009-11-12 09:49:19 -0500 (Thu, 12 Nov 2009)
New Revision: 600
Modified:
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java
Log:
EXOJCR-201 : The JDBCCacheLoader was changed.
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-12 14:20:50 UTC (rev 599)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-12 14:49:19 UTC (rev 600)
@@ -531,9 +531,30 @@
{
// prepare
-
- // tests it
-
+ WorkspaceStorageConnection conn = persistentContainer.openConnection();
+
+ String nodeId = IdGenerator.generate();
+ addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, Constants.NT_UNSTRUCTURED, null);
+ conn.commit();
+
+ // tests
+ conn = persistentContainer.openConnection();
+
+ NodeData srcNodeData = (NodeData) conn.getItemData(nodeId);
+
+ Map<Object, Object> attrebutes = loader.get(Fqn.fromString("/"+JBossCacheStorage.NODES + "/" + nodeId));
+
+ assertNotNull(attrebutes);
+
+ NodeData destNodeData = (NodeData) attrebutes.get(JBossCacheStorage.ITEM_DATA);
+
+ assertNotNull(destNodeData);
+ assertEquals(srcNodeData.getIdentifier(), destNodeData.getIdentifier());
+ assertEquals(srcNodeData.getOrderNumber(), destNodeData.getOrderNumber());
+ assertEquals(srcNodeData.getParentIdentifier(), destNodeData.getParentIdentifier());
+ assertEquals(srcNodeData.getPersistedVersion(), destNodeData.getPersistedVersion());
+ assertEquals(srcNodeData.getQPath().getAsString(), destNodeData.getQPath().getAsString());
+ assertEquals(srcNodeData.getPrimaryTypeName().getAsString(), destNodeData.getPrimaryTypeName().getAsString());
}
public void testGetNodeByName() throws Exception
16 years, 8 months
exo-jcr SVN: r599 - jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2009-11-12 09:20:50 -0500 (Thu, 12 Nov 2009)
New Revision: 599
Modified:
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java
Log:
EXOJCR-201 : The JDBCCacheLoaderTest was changed.
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-12 14:04:23 UTC (rev 598)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-12 14:20:50 UTC (rev 599)
@@ -320,7 +320,7 @@
new AccessControlList()));
// add property (/jcr:primaryType)
- list.add(createProperty(path, Constants.ROOT_UUID, Constants.JCR_PRIMARYTYPE, primaryType, false));
+ list.add(createProperty(path, nodeId, Constants.JCR_PRIMARYTYPE, primaryType, false));
return list;
}
@@ -448,8 +448,8 @@
assertEquals(srcNodeData.getOrderNumber(), destNodeData.getOrderNumber());
assertEquals(srcNodeData.getParentIdentifier(), destNodeData.getParentIdentifier());
assertEquals(srcNodeData.getPersistedVersion(), destNodeData.getPersistedVersion());
- assertEquals(srcNodeData.getQPath(), destNodeData.getQPath());
- assertEquals(srcNodeData.getPrimaryTypeName(), destNodeData.getPrimaryTypeName());
+ assertEquals(srcNodeData.getQPath().getAsString(), destNodeData.getQPath().getAsString());
+ assertEquals(srcNodeData.getPrimaryTypeName().getAsString(), destNodeData.getPrimaryTypeName().getAsString());
}
public void testAddProperty() throws Exception
16 years, 8 months
exo-jcr SVN: r598 - jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2009-11-12 09:04:23 -0500 (Thu, 12 Nov 2009)
New Revision: 598
Modified:
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java
Log:
EXOJCR-201 : The JDBCCacheLoaderTest was changed.
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-12 13:43:12 UTC (rev 597)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-12 14:04:23 UTC (rev 598)
@@ -424,7 +424,7 @@
{
// prepare
String nodeId = IdGenerator.generate();
- List<ItemData> list = createNode(QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node:1")), nodeId, Constants.NT_UNSTRUCTURED, null);
+ List<ItemData> list = createNode(QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, Constants.NT_UNSTRUCTURED, null);
List<Modification> modifications = new ArrayList<Modification>();
@@ -437,8 +437,19 @@
loader.put(modifications);
// tests
+ NodeData srcNodeData = (NodeData) list.get(0);
+
WorkspaceStorageConnection conn = persistentContainer.openConnection();
-
+
+ NodeData destNodeData = (NodeData) conn.getItemData(nodeId);
+
+ assertNotNull(destNodeData);
+ assertEquals(srcNodeData.getIdentifier(), destNodeData.getIdentifier());
+ assertEquals(srcNodeData.getOrderNumber(), destNodeData.getOrderNumber());
+ assertEquals(srcNodeData.getParentIdentifier(), destNodeData.getParentIdentifier());
+ assertEquals(srcNodeData.getPersistedVersion(), destNodeData.getPersistedVersion());
+ assertEquals(srcNodeData.getQPath(), destNodeData.getQPath());
+ assertEquals(srcNodeData.getPrimaryTypeName(), destNodeData.getPrimaryTypeName());
}
public void testAddProperty() throws Exception
16 years, 8 months
exo-jcr SVN: r597 - jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2009-11-12 08:43:12 -0500 (Thu, 12 Nov 2009)
New Revision: 597
Modified:
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java
Log:
EXOJCR-201 : The JDBCCacheLoaderTest was changed.
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-12 13:33:43 UTC (rev 596)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-12 13:43:12 UTC (rev 597)
@@ -423,6 +423,18 @@
public void testAddNode() throws Exception
{
// prepare
+ String nodeId = IdGenerator.generate();
+ List<ItemData> list = createNode(QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node:1")), nodeId, Constants.NT_UNSTRUCTURED, null);
+
+ List<Modification> modifications = new ArrayList<Modification>();
+
+ for (ItemData itemData : list)
+ if (itemData instanceof NodeData)
+ modifications.addAll(addNode((NodeData) itemData));
+ else
+ modifications.addAll(addProperty((PropertyData) itemData));
+
+ loader.put(modifications);
// tests
WorkspaceStorageConnection conn = persistentContainer.openConnection();
16 years, 8 months