svn commit: r477090 - in /jackrabbit/trunk/contrib/spi: spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java

[an...@apache.org]

Author: angela
Date: Sun Nov 19 23:43:07 2006
New Revision: 477090

URL: http://svn.apache.org/viewvc?view=rev&rev=477090
Log:
work in progress

- add 'removeVersion'
  possibility to remove a version was lost while moving 'remove' to
  the Batch interface

Modified:
    jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
    jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java

Modified: jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java?view=diff&rev=477090&r1=477089&r2=477090
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java (original)
+++ jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java Sun Nov 19 23:43:07 2006
@@ -38,6 +38,7 @@
 import javax.jcr.ValueFormatException;
 import javax.jcr.Node;
 import javax.jcr.LoginException;
+import javax.jcr.ReferentialIntegrityException;
 import java.util.Map;
 import java.io.InputStream;
 
@@ -397,6 +398,20 @@
     public void checkout(SessionInfo sessionInfo, NodeId nodeId) throws UnsupportedRepositoryOperationException, LockException, RepositoryException;
 
     /**
+     *
+     * @param sessionInfo
+     * @param versionHistoryId
+     * @param versionId
+     * @throws ReferentialIntegrityException
+     * @throws AccessDeniedException
+     * @throws UnsupportedRepositoryOperationException
+     * @throws VersionException
+     * @throws RepositoryException
+     * @see javax.jcr.version.VersionHistory#removeVersion(String)
+     */
+    public void removeVersion(SessionInfo sessionInfo, NodeId versionHistoryId, NodeId versionId) throws ReferentialIntegrityException, AccessDeniedException, UnsupportedRepositoryOperationException, VersionException, RepositoryException;
+
+    /**
      * @param sessionInfo
      * @param nodeId
      * @param versionId
@@ -552,7 +567,7 @@
      *                    returned.
      * @param filters     the filters that are applied to the external events as
      *                    they occurred on the repository. An event is included
-     *                    in an event bundle if it is {@link EventFilter#accept(Event)
+     *                    in an event bundle if it is {@link EventFilter#accept(Event, boolean)
      *                    accept}ed by at least one of the supplied filters. If
      *                    an empty array is passed none of the potential events
      *                    are include in an event bundle. This allows a client

Modified: jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?view=diff&rev=477090&r1=477089&r2=477090
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Sun Nov 19 23:43:07 2006
@@ -144,6 +144,7 @@
 import javax.jcr.Value;
 import javax.jcr.ValueFactory;
 import javax.jcr.LoginException;
+import javax.jcr.ReferentialIntegrityException;
 import javax.jcr.lock.LockException;
 import javax.jcr.nodetype.ConstraintViolationException;
 import javax.jcr.nodetype.NoSuchNodeTypeException;
@@ -973,6 +974,15 @@
     public void checkout(SessionInfo sessionInfo, NodeId nodeId) throws UnsupportedRepositoryOperationException, LockException, RepositoryException {
         String uri = getItemUri(nodeId, sessionInfo);
         CheckoutMethod method = new CheckoutMethod(uri);
+        execute(method, sessionInfo);
+    }
+
+    /**
+     * @see RepositoryService#removeVersion(SessionInfo, NodeId, NodeId)
+     */
+    public void removeVersion(SessionInfo sessionInfo, NodeId versionHistoryId, NodeId versionId) throws ReferentialIntegrityException, AccessDeniedException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+        String uri = getItemUri(versionId, sessionInfo);
+        DeleteMethod method = new DeleteMethod(uri);
         execute(method, sessionInfo);
     }