Author: nfilotto
Date: 2011-09-01 16:23:57 -0400 (Thu, 01 Sep 2011)
New Revision: 4829
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/AbstractNamePatternFilter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/ExactQPathEntryFilter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/ItemDataNamePatternFilter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestMultipleListenersNotifying.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestWorkspaceStorageCacheInClusterMode.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/TestJBossCacheWorkspaceStorageCache.java
Log:
EXOJCR-1508: Code Cleanup of JCR core
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/AbstractNamePatternFilter.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/AbstractNamePatternFilter.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/AbstractNamePatternFilter.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -131,7 +131,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean accept(ItemData item)
{
if (getAllItems)
@@ -181,7 +180,6 @@
/**
* {@inheritDoc}
*/
- @Override
public List<? extends ItemData> accept(List<? extends ItemData> itemData)
{
if (getAllItems)
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/ExactQPathEntryFilter.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/ExactQPathEntryFilter.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/ExactQPathEntryFilter.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -56,7 +56,6 @@
/**
* {@inheritDoc}
*/
- @Override
public QPathEntry getQPathEntry()
{
return entry;
@@ -65,7 +64,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean accept(ItemData item)
{
QPathEntry itemEntry = item.getQPath().getEntries()[item.getQPath().getDepth()];
@@ -75,7 +73,6 @@
/**
* {@inheritDoc}
*/
- @Override
public List<? extends ItemData> accept(List<? extends ItemData> itemData)
{
List<ItemData> result = new ArrayList<ItemData>();
@@ -120,7 +117,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void writeExternal(ObjectOutput out) throws IOException
{
byte[] buf = entry.getNamespace().getBytes(Constants.DEFAULT_ENCODING);
@@ -137,7 +133,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
byte[] buf = new byte[in.readInt()];
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/ItemDataNamePatternFilter.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/ItemDataNamePatternFilter.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/itemfilters/ItemDataNamePatternFilter.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -101,10 +101,8 @@
/**
* @see
org.exoplatform.services.jcr.impl.core.itemfilters.ItemDataFilter#accept(java.util.List)
*/
- @Override
public List<? extends ItemData> accept(List<? extends ItemData> item)
{
- // TODO Auto-generated method stub
return null;
}
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -41,8 +41,8 @@
import
org.exoplatform.services.jcr.impl.dataflow.session.TransactionableResourceManager;
import
org.exoplatform.services.jcr.impl.dataflow.session.TransactionableResourceManagerListener;
import org.exoplatform.services.jcr.impl.storage.SystemDataContainerHolder;
-import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCStorageConnection;
import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
+import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection;
import org.exoplatform.services.rpc.RPCException;
import org.exoplatform.services.rpc.RPCService;
import org.exoplatform.services.rpc.RemoteCommand;
@@ -1772,25 +1772,25 @@
}
/**
- * Fill Property Value from persistent storage.
- *
- * @param prop PropertyData, original Property data
- * @return PropertyData
- * @throws IllegalStateException
- * @throws RepositoryException
+ * Gets the value content of the property defined by the given parameters
+ * @param propertyId the id of the property
+ * @param orderNumb the order number or the property
+ * @param persistedVersion the persisted version of the property
+ * @return the value content wrapped into a ValueData object
+ * @throws IllegalStateException if connection is already closed
+ * @throws RepositoryException if some exception occurred
*/
protected ValueData getPropertyValue(String propertyId, int orderNumb, int
persistedVersion)
throws IllegalStateException, RepositoryException
{
- // TODO use interface not JDBC
- JDBCStorageConnection conn =
(JDBCStorageConnection)dataContainer.openConnection();
+ final WorkspaceStorageConnection con = dataContainer.openConnection();
try
{
- return conn.getValue(propertyId, orderNumb, persistedVersion);
+ return con.getValue(propertyId, orderNumb, persistedVersion);
}
finally
{
- conn.close();
+ con.close();
}
}
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -45,7 +45,6 @@
import
org.exoplatform.services.jcr.impl.dataflow.session.TransactionableResourceManager;
import
org.exoplatform.services.jcr.impl.dataflow.session.TransactionableResourceManagerListener;
import org.exoplatform.services.jcr.impl.storage.SystemDataContainerHolder;
-import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCStorageConnection;
import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection;
import org.exoplatform.services.log.ExoLogger;
@@ -636,21 +635,13 @@
throws RepositoryException
{
final WorkspaceStorageConnection con = dataContainer.openConnection();
- if (con instanceof JDBCStorageConnection)
+ try
{
- try
- {
- return ((JDBCStorageConnection)con).getChildNodesDataByPage(nodeData,
fromOrderNum, limit, childNodes);
- }
- finally
- {
- con.close();
- }
+ return con.getChildNodesDataByPage(nodeData, fromOrderNum, limit, childNodes);
}
- else
+ finally
{
- throw new UnsupportedOperationException(
- "The method getChildNodesDataLazily is supported only for
JDBCStorageConnection");
+ con.close();
}
}
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -340,4 +340,22 @@
}
}
+ /**
+ * @see
org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#getValue(java.lang.String,
int, int)
+ */
+ public ValueData getValue(String propertyId, int orderNumb, int persistedVersion)
throws IllegalStateException,
+ RepositoryException
+ {
+ return null;
+ }
+
+ /**
+ * @see
org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#getChildNodesDataByPage(org.exoplatform.services.jcr.datamodel.NodeData,
int, int, java.util.List)
+ */
+ public boolean getChildNodesDataByPage(NodeData parent, int fromOrderNum, int limit,
List<NodeData> childs)
+ throws RepositoryException
+ {
+ throw new UnsupportedOperationException(
+ "The method getChildNodesDataLazily is supported only for
JDBCStorageConnection");
+ }
}
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -21,6 +21,7 @@
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.datamodel.QPathEntry;
+import org.exoplatform.services.jcr.datamodel.ValueData;
import org.exoplatform.services.jcr.impl.core.itemfilters.QPathEntryFilter;
import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer;
import org.exoplatform.services.jcr.statistics.JCRStatisticsManager;
@@ -79,6 +80,19 @@
/**
* The description of the statistics corresponding to the method
+ * <code>getChildNodesDataByPage(NodeData nodeData, int fromOrderNum,
+ * int limit, List<NodeData>
childNodes)</code>
+ */
+ private static final String GET_CHILD_NODES_DATA_BY_PAGE_DESCR =
"getChildNodesDataByPage";
+
+ /**
+ * The description of the statistics corresponding to the method
+ * <code>getValue(String propertyId, int orderNumb, int
persistedVersion)</code>
+ */
+ private static final String GET_VALUE_DESCR = "getValue";
+
+ /**
+ * The description of the statistics corresponding to the method
* <code>isOpened()</code>
*/
private static final String IS_OPENED_DESCR = "isOpened";
@@ -181,6 +195,7 @@
ALL_STATISTICS.put(GET_ITEM_DATA_BY_NODE_DATA_NQ_PATH_ENTRY_DESCR, new
Statistics(GLOBAL_STATISTICS,
GET_ITEM_DATA_BY_NODE_DATA_NQ_PATH_ENTRY_DESCR));
ALL_STATISTICS.put(GET_CHILD_NODES_DATA_DESCR, new Statistics(GLOBAL_STATISTICS,
GET_CHILD_NODES_DATA_DESCR));
+ ALL_STATISTICS.put(GET_CHILD_NODES_DATA_BY_PAGE_DESCR, new
Statistics(GLOBAL_STATISTICS, GET_CHILD_NODES_DATA_BY_PAGE_DESCR));
ALL_STATISTICS.put(GET_CHILD_NODES_DATA_PATTERN_DESCR, new
Statistics(GLOBAL_STATISTICS,
GET_CHILD_NODES_DATA_PATTERN_DESCR));
ALL_STATISTICS.put(GET_CHILD_NODES_COUNT_DESCR, new Statistics(GLOBAL_STATISTICS,
GET_CHILD_NODES_COUNT_DESCR));
@@ -192,6 +207,7 @@
ALL_STATISTICS.put(LIST_CHILD_PROPERTIES_DATA_DESCR, new
Statistics(GLOBAL_STATISTICS,
LIST_CHILD_PROPERTIES_DATA_DESCR));
ALL_STATISTICS.put(GET_REFERENCES_DATA_DESCR, new Statistics(GLOBAL_STATISTICS,
GET_REFERENCES_DATA_DESCR));
+ ALL_STATISTICS.put(GET_VALUE_DESCR, new Statistics(GLOBAL_STATISTICS,
GET_VALUE_DESCR));
// Write Methods
// Commit
ALL_STATISTICS.put(COMMIT_DESCR, new Statistics(GLOBAL_STATISTICS, COMMIT_DESCR));
@@ -546,10 +562,46 @@
s.end();
}
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public ValueData getValue(String propertyId, int orderNumb, int persistedVersion)
throws IllegalStateException,
+ RepositoryException
+ {
+ Statistics s = ALL_STATISTICS.get(GET_VALUE_DESCR);
+ try
+ {
+ s.begin();
+ return wcs.getValue(propertyId, orderNumb, persistedVersion);
+ }
+ finally
+ {
+ s.end();
+ }
+ }
/**
* {@inheritDoc}
*/
+ public boolean getChildNodesDataByPage(NodeData parent, int fromOrderNum, int limit,
List<NodeData> childs)
+ throws RepositoryException
+ {
+ Statistics s = ALL_STATISTICS.get(GET_CHILD_NODES_DATA_BY_PAGE_DESCR);
+ try
+ {
+ s.begin();
+ return wcs.getChildNodesDataByPage(parent, fromOrderNum, limit, childs);
+ }
+ finally
+ {
+ s.end();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public void rename(NodeData data) throws RepositoryException,
UnsupportedOperationException,
InvalidItemStateException, IllegalStateException
{
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -23,6 +23,7 @@
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.datamodel.QPathEntry;
+import org.exoplatform.services.jcr.datamodel.ValueData;
import org.exoplatform.services.jcr.impl.core.itemfilters.QPathEntryFilter;
import java.util.List;
@@ -39,7 +40,7 @@
* should have "opened" state. The connection becomes "closed"
(invalid for using) after calling
* commit() or rollback() methods. In this case methods calling will cause an
IllegalStateException
*
- * Connection object intendend to be as "light" as possible i.e. connection
creation SHOULD NOT be
+ * Connection object intended to be as "light" as possible i.e. connection
creation SHOULD NOT be
* expensive operation, so better NOT to open/close potentially EXPENSIVE resources using
by
* Connection (WorkspaceDataContainer should be responsible for that). The Connection IS
NOT a
* thread-safe object and normally SHOULD NOT be pooled/cached.
@@ -58,10 +59,10 @@
* - the item's parent NodeData
* @param name
* - item's path entry (QName + index)
- * @return - stored ItemData wich has exact the same path Entry (name+index) inside
the parent; or
+ * @return - stored ItemData which has exact the same path Entry (name+index) inside
the parent; or
* null if not such an item data found
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -78,10 +79,10 @@
* - item's path entry (QName + index)
* @param itemType
* item type
- * @return - stored ItemData wich has exact the same path Entry (name+index) inside
the parent; or
+ * @return - stored ItemData which has exact the same path Entry (name+index) inside
the parent; or
* null if not such an item data found
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -93,12 +94,12 @@
*
* @param identifier
* - Item identifier
- * @return stored ItemData or null if no item foudn with given id. Basically used for
+ * @return stored ItemData or null if no item found with given id. Basically used for
* Session.getNodeByUUID but not necessarily refers to jcr:uuid property (In
fact, this
* identifier should not necessary be equal of referenceable node's UUID
if any) thereby
* can return NodeData for not referenceable node data or PropertyData.
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -111,7 +112,7 @@
* NodeData
* @return child nodes data or empty <code>List</code>
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -125,7 +126,7 @@
* @param pattern - list of QPathEntryFilters
* @return child nodes data or empty <code>List</code>
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -158,7 +159,7 @@
* NodeData
* @return child properties data or empty <code>List</code>
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -171,10 +172,10 @@
* @param parent
* NodeData
* @param pattern
- * String[] list of wildcard names
+ * String[] list of wild card names
* @return child properties data or empty <code>List</code>
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -186,13 +187,13 @@
* storage using item's parent location.
*
* <br/>
- * This methiod specially dedicated for non-content modification operations (e.g.
Items delete).
+ * This method specially dedicated for non-content modification operations (e.g. Items
delete).
*
* @param parent
* NodeData
* @return child properties data (with empty data) or empty
<code>List</code>
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -211,7 +212,7 @@
* of referenceable Node
* @return list of referenced property data or empty <code>List</code>
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
* @throws UnsupportedOperationException
@@ -221,6 +222,39 @@
UnsupportedOperationException;
/**
+ * Gets the value content of the property defined by the given parameters.
+ *
+ * @param propertyId
+ * the id of the property
+ * @param orderNumb
+ * the order number or the property
+ * @param persistedVersion
+ * the persisted version of the property
+ * @return the value content wrapped into a ValueData object
+ * @throws IllegalStateException
+ * if connection is already closed
+ * @throws RepositoryException
+ * if some exception occurred
+ */
+ ValueData getValue(String propertyId, int orderNumb, int persistedVersion) throws
IllegalStateException, RepositoryException;
+
+ /**
+ * Get child Nodes of the parent node.
+ *
+ * @param parent
+ * the parent data
+ * @param fromOrderNum
+ * the last order number returned in previous request
+ * @param limit
+ * the recommended amount of children nodes to return
+ * @param childs
+ * will contain the resulted children nodes
+ * @return true if there are data to retrieve for next request and false in other case
+ */
+ boolean getChildNodesDataByPage(NodeData parent, int fromOrderNum, int limit,
List<NodeData> childs)
+ throws RepositoryException;
+
+ /**
* Adds single <code>NodeData</code>.
*
* @param data
@@ -230,7 +264,7 @@
* @throws UnsupportedOperationException
* if operation is not supported (it is container for level 1)
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -247,7 +281,7 @@
* @throws UnsupportedOperationException
* if operation is not supported (it is container for level 1)
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -262,12 +296,12 @@
* @throws InvalidItemStateException
* (1)if the data is already updated, i.e. persisted version value of
persisted data >=
* of new data's persisted version value (2) if the persisted data is
not NodeData (i.e.
- * it is PropertyData). It means that some other proccess deleted original
data and
+ * it is PropertyData). It means that some other process deleted original
data and
* replace it with other type of data.
* @throws UnsupportedOperationException
* if operation is not supported (it is container for level 1)
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -282,12 +316,12 @@
* @throws InvalidItemStateException
* (1)if the data is already updated, i.e. persisted version value of
persisted data >=
* of new data's persisted version value (2) if the persisted data is
not PropertyData
- * (i.e. it is NodeData). It means that some other proccess deleted original
data and
+ * (i.e. it is NodeData). It means that some other process deleted original
data and
* replace it with other type of data.
* @throws UnsupportedOperationException
* if operation is not supported (it is container for level 1)
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -302,12 +336,12 @@
* @throws InvalidItemStateException
* (1)if the data is already updated, i.e. persisted version value of
persisted data >=
* of new data's persisted version value (2) if the persisted data is
not PropertyData
- * (i.e. it is NodeData). It means that some other proccess deleted original
data and
+ * (i.e. it is NodeData). It means that some other process deleted original
data and
* replace it with other type of data.
* @throws UnsupportedOperationException
* if operation is not supported (it is container for level 1)
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -325,7 +359,7 @@
* @throws UnsupportedOperationException
* if operation is not supported (it is container for level 1)
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -343,7 +377,7 @@
* @throws UnsupportedOperationException
* if operation is not supported (it is container for level 1)
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
* @throws IllegalStateException
* if connection is closed
*/
@@ -356,7 +390,7 @@
* @throws IllegalStateException
* if connection is already closed
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
*/
void commit() throws IllegalStateException, RepositoryException;
@@ -367,7 +401,7 @@
* @throws IllegalStateException
* if connection is already closed
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
*/
void rollback() throws IllegalStateException, RepositoryException;
@@ -377,7 +411,7 @@
* @throws IllegalStateException
* if connection is already closed
* @throws RepositoryException
- * if some exception occured
+ * if some exception occurred
*/
void close() throws IllegalStateException, RepositoryException;
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -599,6 +599,18 @@
return null;
}
+ public ValueData getValue(String propertyId, int orderNumb, int persistedVersion)
throws IllegalStateException,
+ RepositoryException
+ {
+ return null;
+ }
+
+ public boolean getChildNodesDataByPage(NodeData parent, int fromOrderNum, int
limit, List<NodeData> childs)
+ throws RepositoryException
+ {
+ return false;
+ }
+
};
private static class MyWorkspaceDataContainer extends WorkspaceDataContainerBase
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestMultipleListenersNotifying.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestMultipleListenersNotifying.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestMultipleListenersNotifying.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -43,7 +43,6 @@
super(null, new SystemDataContainerHolder(null));
}
- @Override
public void save(ItemStateChangesLog changes) throws InvalidItemStateException,
UnsupportedOperationException,
RepositoryException
{
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestWorkspaceStorageCacheInClusterMode.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestWorkspaceStorageCacheInClusterMode.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestWorkspaceStorageCacheInClusterMode.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -949,8 +949,19 @@
return children;
}
+
+ public ValueData getValue(String propertyId, int orderNumb, int persistedVersion)
throws IllegalStateException,
+ RepositoryException
+ {
+ return null;
+ }
+
+ public boolean getChildNodesDataByPage(NodeData parent, int fromOrderNum, int
limit, List<NodeData> childs)
+ throws RepositoryException
+ {
+ return false;
+ }
-
};
private static class MyWorkspaceDataContainer extends WorkspaceDataContainerBase
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/TestJBossCacheWorkspaceStorageCache.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/TestJBossCacheWorkspaceStorageCache.java 2011-09-01
18:04:48 UTC (rev 4828)
+++
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/TestJBossCacheWorkspaceStorageCache.java 2011-09-01
20:23:57 UTC (rev 4829)
@@ -32,11 +32,11 @@
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.PropertyData;
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.core.itemfilters.QPathEntryFilter;
import
org.exoplatform.services.jcr.impl.dataflow.persistent.CacheableWorkspaceDataManager;
import
org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspaceStorageCacheBaseCase;
-import
org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache;
import org.exoplatform.services.jcr.impl.storage.SystemDataContainerHolder;
import org.exoplatform.services.jcr.impl.storage.WorkspaceDataContainerBase;
import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
@@ -315,6 +315,18 @@
return getChildNodesData(parent);
}
+ public ValueData getValue(String propertyId, int orderNumb, int persistedVersion)
throws IllegalStateException,
+ RepositoryException
+ {
+ return null;
+ }
+
+ public boolean getChildNodesDataByPage(NodeData parent, int fromOrderNum, int
limit, List<NodeData> childs)
+ throws RepositoryException
+ {
+ return false;
+ }
+
};
private static class MyWorkspaceDataContainer extends WorkspaceDataContainerBase