[exo-jcr-commits] exo-jcr SVN: r2450 - in jcr/trunk/exo.jcr.component.core: src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache and 2 other directories.

Author: sergiykarpenko Date: 2010-06-02 08:23:09 -0400 (Wed, 02 Jun 2010) New Revision: 2450 Modified: jcr/trunk/exo.jcr.component.core/pom.xml jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestOrderBefore.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestOrderBeforeOnTree.java Log: EXOJCR-763: Samename nodes reordering now updates all child in cache. Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-02 09:19:44 UTC (rev 2449) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-02 12:23:09 UTC (rev 2450) @@ -424,7 +424,6 @@ <exclude>org/exoplatform/services/jcr/**/impl/**/SQLBenchmarkTest.java</exclude> <exclude>org/exoplatform/services/jcr/**/impl/**/TestLockPerstistentDataManager.java</exclude> <exclude>org/exoplatform/services/jcr/**/impl/**/TestCleanableFileStreamValueData.java</exclude> - <exclude>org/exoplatform/services/jcr/**/usecases/TestOrderBeforeOnTree.java</exclude> </excludes> </configuration> </plugin> @@ -694,7 +693,6 @@ <exclude>org/exoplatform/services/jcr/**/impl/**/SQLBenchmarkTest.java</exclude> <exclude>org/exoplatform/services/jcr/**/impl/**/TestCleanableFileStreamValueData.java</exclude> <exclude>org/exoplatform/services/jcr/**/impl/**/TestLockPerstistentDataManager.java</exclude> - <exclude>org/exoplatform/services/jcr/**/usecases/TestOrderBeforeOnTree.java</exclude> <!-- From TCK --> <exclude>org/apache/jackrabbit/test/api/TestAll.java</exclude> <exclude>org/apache/jackrabbit/test/api/**/Abstract*.java</exclude> Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-06-02 09:19:44 UTC (rev 2449) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-06-02 12:23:09 UTC (rev 2450) @@ -836,6 +836,7 @@ cache.addToList(makeChildListFqn(childNodesList, node.getParentIdentifier()), ITEM_LIST, node .getIdentifier()); } + } // add in ITEMS return (ItemData)cache.put(makeItemFqn(node.getIdentifier()), ITEM_DATA, node); @@ -901,9 +902,15 @@ .getIdentifier()); // remove from CHILD_NODES as parent - cache.removeNode(makeChildListFqn(childNodes, item.getIdentifier())); + Fqn<String> parentFqn = makeChildListFqn(childNodes, item.getIdentifier()); + Node<Serializable, Object> parent = cache.getNode(parentFqn); + if (parent != null && parent.isLeaf()) + { + cache.removeNode(parentFqn); + } // remove from CHILD_NODES_LIST as parent + cache.removeNode(makeChildListFqn(childNodesList, item.getIdentifier())); // remove from CHILD_PROPS as parent Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestOrderBefore.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestOrderBefore.java 2010-06-02 09:19:44 UTC (rev 2449) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestOrderBefore.java 2010-06-02 12:23:09 UTC (rev 2450) @@ -808,15 +808,7 @@ testBase.orderBefore("n1[3]", null); String[] order = new String[]{"n1", "n1[2]", "n1[3]", "n2", "n1[4]"}; // n1 - // [ - // 3 - // ] - // - - // > - // n1 - // [ - // 4 - // ] + // [3]->n1[4] checkOrder(order); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestOrderBeforeOnTree.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestOrderBeforeOnTree.java 2010-06-02 09:19:44 UTC (rev 2449) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestOrderBeforeOnTree.java 2010-06-02 12:23:09 UTC (rev 2450) @@ -19,8 +19,10 @@ import org.exoplatform.services.jcr.datamodel.ItemData; import org.exoplatform.services.jcr.datamodel.QPath; import org.exoplatform.services.jcr.impl.core.NodeImpl; +import org.exoplatform.services.jcr.impl.core.PropertyImpl; import javax.jcr.Node; +import javax.jcr.PropertyIterator; /** * Created by The eXo Platform SAS. @@ -98,8 +100,13 @@ fail("Expected path " + expectedPath + " but was " + realPath); } + //check properties path + PropertyIterator pit = n.getProperties(); + while (pit.hasNext()) + { + PropertyImpl p = (PropertyImpl)pit.nextProperty(); + assertEquals(expectedPath, p.getInternalPath().makeParentPath()); + } } - } - }