[exo-jcr-commits] exo-jcr SVN: r928 - in jcr/branches/1.12.0-JBC/component/core/src: main/java/org/exoplatform/services/jcr/impl/core/query/lucene and 2 other directories.

[do-not-reply at jboss.org]

Author: pnedonosko
Date: 2009-12-04 11:45:41 -0500 (Fri, 04 Dec 2009)
New Revision: 928

Modified:
   jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
   jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java
   jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java
   jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/TestItemAccess.java
Log:
EXOJCR-307: getItemData(String) returns only NodeData

Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java	2009-12-04 16:15:15 UTC (rev 927)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java	2009-12-04 16:45:41 UTC (rev 928)
@@ -873,7 +873,9 @@
          {
             try
             {
-               PropertyData vhPropertyData = (PropertyData)getItemData(data.getIdentifier());
+               PropertyData vhPropertyData =
+                  (PropertyData)getItemData((NodeData)getItemData(data.getParentIdentifier()), data.getQPath()
+                     .getEntries()[data.getQPath().getEntries().length - 1]);
                removeVersionHistory(new String(vhPropertyData.getValues().get(0).getAsByteArray()), null,
                   ancestorToSave);
             }

Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java	2009-12-04 16:15:15 UTC (rev 927)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java	2009-12-04 16:45:41 UTC (rev 928)
@@ -402,8 +402,9 @@
             // WARN. DON'T USE access item BY PATH - it's may be a node in case of
             // residual definitions in NT
             List<ValueData> data =
-               prop.getValues().size() > 0 ? prop.getValues() : ((PropertyData)stateProvider.getItemData(prop
-                  .getIdentifier())).getValues();
+               prop.getValues().size() > 0 ? prop.getValues() : ((PropertyData)stateProvider.getItemData(
+                  (NodeData)stateProvider.getItemData(prop.getParentIdentifier()), prop.getQPath().getEntries()[prop
+                     .getQPath().getEntries().length - 1])).getValues();
 
             if (data == null)
                log.warn("null value found at property " + prop.getQPath().getAsString());

Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java	2009-12-04 16:15:15 UTC (rev 927)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java	2009-12-04 16:45:41 UTC (rev 928)
@@ -593,22 +593,24 @@
             throw new RepositoryException("FATAL NodeData empty " + identifier);
          }
       }
-      else
-      {
-         Node<Serializable, Object> prop = propsRoot.getChild(makePropFqn(identifier));
-         if (prop != null)
-         {
-            Object itemData = prop.get(ITEM_DATA);
-            if (itemData != null)
-            {
-               return (PropertyData)itemData;
-            }
-            else
-            {
-               throw new RepositoryException("FATAL PropertyData empty " + identifier);
-            }
-         }
-      }
+      
+      // only Nodes by Id
+//      else
+//      {
+//         Node<Serializable, Object> prop = propsRoot.getChild(makePropFqn(identifier));
+//         if (prop != null)
+//         {
+//            Object itemData = prop.get(ITEM_DATA);
+//            if (itemData != null)
+//            {
+//               return (PropertyData)itemData;
+//            }
+//            else
+//            {
+//               throw new RepositoryException("FATAL PropertyData empty " + identifier);
+//            }
+//         }
+//      }
 
       return null;
    }

Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/TestItemAccess.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/TestItemAccess.java	2009-12-04 16:15:15 UTC (rev 927)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/TestItemAccess.java	2009-12-04 16:45:41 UTC (rev 928)
@@ -58,7 +58,7 @@
       nGen.genereteTree();
       validNames = NameTraversingVisitor.getValidNames(testGetItemNode, NameTraversingVisitor.SCOPE_ALL);
 
-      validUuids = NameTraversingVisitor.getValidUuids(testGetItemNode, NameTraversingVisitor.SCOPE_ALL);
+      validUuids = NameTraversingVisitor.getValidUuids(testGetItemNode, NameTraversingVisitor.SCOPE_NODES);
    }
 
    public void testGetItemTest() throws RepositoryException