Author: pnedonosko Date: 2009-11-30 06:57:21 -0500 (Mon, 30 Nov 2009) New Revision: 907 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/JDBCCacheLoader.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java Log: EXOJCR-201: Fqn.ROOT handling fix for exists(); comments; delete deprecated in JDBC conn 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-11-30 10:36:38 UTC (rev 906) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-11-30 11:57:21 UTC (rev 907) @@ -109,7 +109,13 @@ this.cache = cache; } - // helpers + /** + * Made for read of ItemData with cache invalidation. + * NOT USED! + * + * @param node Node + * @return ItemData + */ @Deprecated protected ItemData readItemData(Node<Serializable, Object> node) { @@ -923,7 +929,6 @@ updateChildsACL(childNode, newACL); } } - } /** 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-30 10:36:38 UTC (rev 906) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-30 11:57:21 UTC (rev 907) @@ -560,7 +560,7 @@ } } } - else if (name.get(0).equals(Fqn.ROOT) || name.get(0).equals(JBossCacheStorage.PROPS) + else if (name.equals(Fqn.ROOT) || name.get(0).equals(JBossCacheStorage.PROPS) || name.get(0).equals(JBossCacheStorage.NODES) || name.get(0).equals(JBossCacheStorage.LOCKS) || name.get(0).equals(JBossCacheStorage.REFS)) { Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-30 10:36:38 UTC (rev 906) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-30 11:57:21 UTC (rev 907) @@ -418,6 +418,7 @@ /** * {@inheritDoc} */ + @Deprecated public void delete(NodeData data) throws RepositoryException, UnsupportedOperationException, InvalidItemStateException, IllegalStateException { @@ -449,6 +450,7 @@ /** * {@inheritDoc} */ + @Deprecated public void delete(PropertyData data) throws RepositoryException, UnsupportedOperationException, InvalidItemStateException, IllegalStateException {