jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r478578 - 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
Date Thu, 23 Nov 2006 14:06:43 GMT
Author: angela
Date: Thu Nov 23 06:06:37 2006
New Revision: 478578

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

- some javadoc with Observation features
- add return-value to lock-method

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=478578&r1=478577&r2=478578
==============================================================================
--- 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
Thu Nov 23 06:06:37 2006
@@ -337,6 +337,7 @@
      * @param nodeId
      * @param deep
      * @param sessionScoped
+     * @return returns the <code>LockInfo</code> associated with this lock.
      * @throws javax.jcr.UnsupportedRepositoryOperationException
      * @throws javax.jcr.lock.LockException
      * @throws javax.jcr.AccessDeniedException
@@ -344,7 +345,7 @@
      * @throws javax.jcr.RepositoryException
      * @see javax.jcr.Node#lock(boolean, boolean)
      */
-    public void lock(SessionInfo sessionInfo, NodeId nodeId, boolean deep, boolean sessionScoped)
throws UnsupportedRepositoryOperationException, LockException, AccessDeniedException, InvalidItemStateException,
RepositoryException;
+    public LockInfo lock(SessionInfo sessionInfo, NodeId nodeId, boolean deep, boolean sessionScoped)
throws UnsupportedRepositoryOperationException, LockException, AccessDeniedException, InvalidItemStateException,
RepositoryException;
 
     /**
      * Explicit refresh of an existing lock. Existing locks should be refreshed
@@ -450,7 +451,7 @@
      * @param srcWorkspaceName
      * @param bestEffort
      * @return an <code>IdIterator</code> over all nodes that received a merge
-     *         result of "fail" in the course of this operation.
+     * result of "fail" in the course of this operation.
      * @throws javax.jcr.NoSuchWorkspaceException
      * @throws javax.jcr.AccessDeniedException
      * @throws javax.jcr.MergeException
@@ -522,27 +523,28 @@
     //--------------------------------------------------------< Observation >---
 
     /**
-     * Creates an event filter based on the parameters available in {@link
-     * javax.jcr.observation.ObservationManager#addEventListener}.
+     * Creates an event filter. If the repository supportes observation, the
+     * filter created is based on the parameters available in {@link
+     * javax.jcr.observation.ObservationManager#addEventListener}.<p/>
+     * Note, that an SPI implementation may support observation even if
+     * the corresponding {@link javax.jcr.Repository#OPTION_OBSERVATION_SUPPORTED repository
descriptor}
+     * does not return 'true'.
      *
-     * @param eventTypes   A combination of one or more event type constants
-     *                     encoded as a bitmask.
-     * @param absPath      an absolute path.
-     * @param isDeep       a <code>boolean</code>.
-     * @param uuid         array of UUIDs.
-     * @param nodeTypeName array of node type names.
-     * @param noLocal      a <code>boolean</code>.
+     * @param eventTypes A combination of one or more event type constants
+     * encoded as a bitmask.
+     * @param absPath An absolute path.
+     * @param isDeep A <code>boolean</code>.
+     * @param uuid Array of UUIDs.
+     * @param nodeTypeName Array of node type names.
+     * @param noLocal A <code>boolean</code>.
      * @return the event filter instance with the given parameters.
-     * @throws UnsupportedRepositoryOperationException
-     *          if this implementation does not support observation.
+     * @throws UnsupportedRepositoryOperationException if this SPI implementation
+     * does not allow to create event filters.
      * @see javax.jcr.observation.ObservationManager#addEventListener(javax.jcr.observation.EventListener,
int, String, boolean, String[], String[], boolean)
      */
-    public EventFilter createEventFilter(int eventTypes,
-                                         Path absPath,
-                                         boolean isDeep,
-                                         String[] uuid,
-                                         QName[] nodeTypeName,
-                                         boolean noLocal)
+    public EventFilter createEventFilter(int eventTypes, Path absPath,
+                                         boolean isDeep, String[] uuid,
+                                         QName[] nodeTypeName, boolean noLocal)
             throws UnsupportedRepositoryOperationException;
 
     /**
@@ -558,7 +560,10 @@
      * also support event filters instanciated by the client itself. An
      * implementation may require special deployment in that case, e.g. to make
      * the event filter implementation class available to the repository
-     * server.
+     * server.<p/>
+     * Note, that an SPI implementation may support observation even if
+     * the corresponding {@link javax.jcr.Repository#OPTION_OBSERVATION_SUPPORTED repository
descriptor}
+     * does not return 'true'.
      *
      * @param sessionInfo the session info.
      * @param timeout     a timeout in milliseconds to wait at most for an
@@ -581,15 +586,12 @@
      *                              identifier in <code>sessionInfo</code>
      *                              references an unknown or outdated event
      *                              bundle.
-     * @throws UnsupportedRepositoryOperationException
-     *                              if this implementation does not support
-     *                              observation.
+     * @throws UnsupportedRepositoryOperationException If this SPI implementation
+     * does not support observation.
      * @throws InterruptedException if the calling thread is interrupted while
-     *                              waiting for events within the specified
-     *                              <code>timeout</code>.
+     * waiting for events within the specified <code>timeout</code>.
      */
-    public EventBundle[] getEvents(SessionInfo sessionInfo,
-                                   long timeout,
+    public EventBundle[] getEvents(SessionInfo sessionInfo, long timeout,
                                    EventFilter[] filters)
             throws RepositoryException, UnsupportedRepositoryOperationException, InterruptedException;
 

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=478578&r1=478577&r2=478578
==============================================================================
--- 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
Thu Nov 23 06:06:37 2006
@@ -911,7 +911,7 @@
     /**
      * @see RepositoryService#lock(SessionInfo, NodeId, boolean, boolean)
      */
-    public void lock(SessionInfo sessionInfo, NodeId nodeId, boolean deep, boolean sessionScoped)
throws UnsupportedRepositoryOperationException, LockException, AccessDeniedException, InvalidItemStateException,
RepositoryException {
+    public LockInfo lock(SessionInfo sessionInfo, NodeId nodeId, boolean deep, boolean sessionScoped)
throws UnsupportedRepositoryOperationException, LockException, AccessDeniedException, InvalidItemStateException,
RepositoryException {
         try {
             String uri = getItemUri(nodeId, sessionInfo);
             Scope scope = (sessionScoped) ? ItemResourceConstants.EXCLUSIVE_SESSION : Scope.EXCLUSIVE;
@@ -922,10 +922,12 @@
             String lockToken = method.getLockToken();
             sessionInfo.addLockToken(lockToken);
 
-            // TODO: ev. need to take care of 'timeout' ?
-            // TODO: ev. evaluate lock response, if depth and type is according to request?
+            LockDiscovery disc = method.getResponseAsLockDiscovery();
+            return new LockInfoImpl(disc, nodeId);
         } catch (IOException e) {
             throw new RepositoryException(e);
+        } catch (DavException e) {
+            throw ExceptionConverter.generate(e);
         }
     }
 



Mime
View raw message