jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r772900 - in /jackrabbit/trunk: jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/LockInfoImpl.java
Date Fri, 08 May 2009 09:20:37 GMT
Author: angela
Date: Fri May  8 09:20:35 2009
New Revision: 772900

URL: http://svn.apache.org/viewvc?rev=772900&view=rev
Log:
JCR-2004: Update SPI locking to match JCR 2.0
JCR-2097: Broke lock tests in jcr2spi after the JCR 2.0 upgrade

- adjusted spi2jcr LockInfo implementation. that doesn't yet fix all broken tests... but those
related to lock ownership
- deprecated the old LockInfoImpl constructor in spi-commons

Modified:
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java
    jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/LockInfoImpl.java

Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java?rev=772900&r1=772899&r2=772900&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java
Fri May  8 09:20:35 2009
@@ -70,6 +70,7 @@
      * @param isDeep whether this lock is deep or not
      * @param isSessionScoped whether this lock is session scoped or not
      * @param nodeId the node id of the locked node.
+     * @deprecated Use {@link #LockInfoImpl(String, String, boolean, boolean, long, boolean,
NodeId)} instaed.
      */
     public LockInfoImpl(String lockToken, String lockOwner, boolean isDeep,
                         boolean isSessionScoped, NodeId nodeId) {

Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/LockInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/LockInfoImpl.java?rev=772900&r1=772899&r2=772900&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/LockInfoImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/LockInfoImpl.java
Fri May  8 09:20:35 2009
@@ -39,8 +39,8 @@
      */
     private LockInfoImpl(Lock lock, IdFactoryImpl idFactory,
                          NamePathResolver resolver) throws RepositoryException {
-        super(lock.getLockToken(), lock.getLockOwner(),
-                lock.isDeep(), lock.isSessionScoped(),
+        super(lock.getLockToken(), lock.getLockOwner(), lock.isDeep(),
+                lock.isSessionScoped(), lock.getSecondsRemaining(), lock.isLockOwningSession(),

                 idFactory.createNodeId(lock.getNode(), resolver));
     }
 



Mime
View raw message