You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2009/07/16 11:03:28 UTC
svn commit: r794600 -
/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
Author: angela
Date: Thu Jul 16 09:03:28 2009
New Revision: 794600
URL: http://svn.apache.org/viewvc?rev=794600&view=rev
Log:
fixing minor issues and insert 2.0 methods to the corresponding block
Modified:
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java?rev=794600&r1=794599&r2=794600&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java Thu Jul 16 09:03:28 2009
@@ -250,7 +250,7 @@
public QPropertyDefinition getPropertyDefinition(SessionInfo sessionInfo, PropertyId propertyId)
throws RepositoryException {
- return getPropertyDefinition(sessionInfo, propertyId);
+ return repositoryService.getPropertyDefinition(sessionInfo, propertyId);
}
public abstract NodeInfo getNodeInfo(SessionInfo sessionInfo, NodeId nodeId) throws RepositoryException;
@@ -261,6 +261,12 @@
public abstract PropertyInfo getPropertyInfo(SessionInfo sessionInfo, PropertyId propertyId);
+ public Iterator<PropertyId> getReferences(SessionInfo sessionInfo, NodeId nodeId, Name propertyName,
+ boolean weakReferences) throws RepositoryException {
+
+ return repositoryService.getReferences(sessionInfo, nodeId, propertyName, weakReferences);
+ }
+
//-----------------------------------------------< general modification >---
public Batch createBatch(SessionInfo sessionInfo, ItemId itemId) throws RepositoryException {
@@ -323,6 +329,12 @@
return repositoryService.lock(sessionInfo, nodeId, deep, sessionScoped);
}
+ public LockInfo lock(SessionInfo sessionInfo, NodeId nodeId, boolean deep, boolean sessionScoped,
+ long timeoutHint, String ownerHint) throws RepositoryException {
+
+ return repositoryService.lock(sessionInfo, nodeId, deep, sessionScoped, timeoutHint, ownerHint);
+ }
+
public void refreshLock(SessionInfo sessionInfo, NodeId nodeId)
throws RepositoryException {
@@ -335,7 +347,6 @@
repositoryService.unlock(sessionInfo, nodeId);
}
-
//---------------------------------------------------------< Versioning >---
public NodeId checkin(SessionInfo sessionInfo, NodeId nodeId) throws RepositoryException {
@@ -346,6 +357,12 @@
repositoryService.checkout(sessionInfo, nodeId);
}
+ public NodeId checkpoint(SessionInfo sessionInfo, NodeId nodeId)
+ throws RepositoryException {
+
+ return repositoryService.checkpoint(sessionInfo, nodeId);
+ }
+
public void removeVersion(SessionInfo sessionInfo, NodeId versionHistoryId, NodeId versionId)
throws RepositoryException {
@@ -370,6 +387,12 @@
return repositoryService.merge(sessionInfo, nodeId, srcWorkspaceName, bestEffort);
}
+ public Iterator<NodeId> merge(SessionInfo sessionInfo, NodeId nodeId, String srcWorkspaceName,
+ boolean bestEffort, boolean isShallow) throws RepositoryException {
+
+ return repositoryService.merge(sessionInfo, nodeId, srcWorkspaceName, bestEffort, isShallow);
+ }
+
public void resolveMergeConflict(SessionInfo sessionInfo, NodeId nodeId, NodeId[] mergeFailedIds,
NodeId[] predecessorIds) throws RepositoryException {
@@ -379,7 +402,7 @@
public void addVersionLabel(SessionInfo sessionInfo, NodeId versionHistoryId, NodeId versionId,
Name label, boolean moveLabel) throws RepositoryException {
- addVersionLabel(sessionInfo, versionHistoryId, versionId, label, moveLabel);
+ repositoryService.addVersionLabel(sessionInfo, versionHistoryId, versionId, label, moveLabel);
}
public void removeVersionLabel(SessionInfo sessionInfo, NodeId versionHistoryId, NodeId versionId,
@@ -388,6 +411,29 @@
repositoryService.removeVersionLabel(sessionInfo, versionHistoryId, versionId, label);
}
+ public NodeId createActivity(SessionInfo sessionInfo, String title)
+ throws RepositoryException {
+
+ return repositoryService.createActivity(sessionInfo, title);
+ }
+
+ public void removeActivity(SessionInfo sessionInfo, NodeId activityId)
+ throws RepositoryException {
+
+ repositoryService.removeActivity(sessionInfo, activityId);
+ }
+
+ public Iterator mergeActivity(SessionInfo sessionInfo, NodeId activityId)
+ throws RepositoryException {
+
+ return repositoryService.mergeActivity(sessionInfo, activityId);
+ }
+
+ public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId, NodeId baselineId)
+ throws RepositoryException {
+
+ return repositoryService.createConfiguration(sessionInfo, nodeId, baselineId);
+ }
//----------------------------------------------------------< Searching >---
@@ -437,6 +483,12 @@
return repositoryService.getEvents(subscription, timeout);
}
+ public EventBundle getEvents(SessionInfo sessionInfo, EventFilter filter, long after)
+ throws RepositoryException {
+
+ return repositoryService.getEvents(sessionInfo, filter, after);
+ }
+
public void dispose(Subscription subscription) throws RepositoryException {
repositoryService.dispose(subscription);
}
@@ -485,23 +537,19 @@
return repositoryService.getQNodeTypeDefinitions(sessionInfo, nodeTypeNames);
}
- public NodeId checkpoint(SessionInfo sessionInfo, NodeId nodeId)
- throws RepositoryException {
+ public void registerNodeTypes(SessionInfo sessionInfo, QNodeTypeDefinition[] nodeTypeDefinitions,
+ boolean allowUpdate) throws RepositoryException {
- return repositoryService.checkpoint(sessionInfo, nodeId);
+ repositoryService.registerNodeTypes(sessionInfo, nodeTypeDefinitions, allowUpdate);
}
- public NodeId createActivity(SessionInfo sessionInfo, String title)
- throws RepositoryException {
+ public void unregisterNodeTypes(SessionInfo sessionInfo, Name[] nodeTypeNames)
+ throws UnsupportedRepositoryOperationException, NoSuchNodeTypeException, RepositoryException {
- return repositoryService.createActivity(sessionInfo, title);
+ repositoryService.unregisterNodeTypes(sessionInfo, nodeTypeNames);
}
- public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId, NodeId baselineId)
- throws RepositoryException {
-
- return repositoryService.createConfiguration(sessionInfo, nodeId, baselineId);
- }
+ //-----------------------------------------------< Workspace Management >---
public void createWorkspace(SessionInfo sessionInfo, String name, String srcWorkspaceName)
throws RepositoryException {
@@ -512,56 +560,6 @@
public void deleteWorkspace(SessionInfo sessionInfo, String name) throws RepositoryException {
repositoryService.deleteWorkspace(sessionInfo, name);
}
-
- public EventBundle getEvents(SessionInfo sessionInfo, EventFilter filter, long after)
- throws RepositoryException {
-
- return repositoryService.getEvents(sessionInfo, filter, after);
- }
-
- public Iterator<PropertyId> getReferences(SessionInfo sessionInfo, NodeId nodeId, Name propertyName,
- boolean weakReferences) throws RepositoryException {
-
- return getReferences(sessionInfo, nodeId, propertyName, weakReferences);
- }
-
- public LockInfo lock(SessionInfo sessionInfo, NodeId nodeId, boolean deep, boolean sessionScoped,
- long timeoutHint, String ownerHint) throws RepositoryException {
-
- return repositoryService.lock(sessionInfo, nodeId, deep, sessionScoped, timeoutHint, ownerHint);
- }
-
- public Iterator<NodeId> merge(SessionInfo sessionInfo, NodeId nodeId, String srcWorkspaceName,
- boolean bestEffort, boolean isShallow) throws RepositoryException {
-
- return null;
- }
-
- @SuppressWarnings("unchecked")
- public Iterator mergeActivity(SessionInfo sessionInfo, NodeId activityId)
- throws RepositoryException {
-
- return repositoryService.mergeActivity(sessionInfo, activityId);
- }
-
- public void registerNodeTypes(SessionInfo sessionInfo, QNodeTypeDefinition[] nodeTypeDefinitions,
- boolean allowUpdate) throws RepositoryException {
-
- repositoryService.registerNodeTypes(sessionInfo, nodeTypeDefinitions, allowUpdate);
- }
-
- public void removeActivity(SessionInfo sessionInfo, NodeId activityId)
- throws RepositoryException {
-
- repositoryService.removeActivity(sessionInfo, activityId);
- }
-
- public void unregisterNodeTypes(SessionInfo sessionInfo, Name[] nodeTypeNames)
- throws UnsupportedRepositoryOperationException, NoSuchNodeTypeException, RepositoryException {
-
- repositoryService.unregisterNodeTypes(sessionInfo, nodeTypeNames);
- }
-
}