jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cko...@apache.org
Subject svn commit: r1291222 - in /jackrabbit/trunk/jackrabbit-jcr-rmi: ./ src/main/java/org/apache/jackrabbit/rmi/client/ src/main/java/org/apache/jackrabbit/rmi/client/security/ src/main/java/org/apache/jackrabbit/rmi/remote/ src/main/java/org/apache/jackrab...
Date Mon, 20 Feb 2012 12:00:31 GMT
Author: ckoell
Date: Mon Feb 20 12:00:30 2012
New Revision: 1291222

URL: http://svn.apache.org/viewvc?rev=1291222&view=rev
Log:
JCR-3206 work in progress ...

Modified:
    jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/BrokenRemoteRepository.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientLock.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNode.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientQuery.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientRepository.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionManager.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SafeClientRepository.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/security/ClientPrivilege.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRepository.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerLock.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNode.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRepository.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRow.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionManager.java

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml Mon Feb 20 12:00:30 2012
@@ -149,53 +149,15 @@
 org.apache.jackrabbit.test.api.ShareableNodeTest
 org.apache.jackrabbit.test.api.SetValueValueFormatExceptionTest#testNodeNotReferenceable
 
-org.apache.jackrabbit.test.api.LifecycleTest#testFollowLifecycleTransition
-org.apache.jackrabbit.test.api.LifecycleTest#testGetAllowedLifecycleTransitions
 org.apache.jackrabbit.test.api.NameTest#testExpandedNameValue
 org.apache.jackrabbit.test.api.NameTest#testExpandedNameValueProperty
 org.apache.jackrabbit.test.api.NodeRemoveMixinTest#testNotAssigned
-org.apache.jackrabbit.test.api.RepositoryDescriptorTest#testGetDescriptorValues
-org.apache.jackrabbit.test.api.RepositoryDescriptorTest#testRequiredDescriptors
 org.apache.jackrabbit.test.api.ValueFactoryTest#testValueFormatException
 org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreWithParent
 org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreWithParentJcr2
 
-org.apache.jackrabbit.test.api.AddNodeTest#testAbstractNodeType
 org.apache.jackrabbit.test.api.GetWeakReferencesTest#testMultiValues
-org.apache.jackrabbit.test.api.GetWeakReferencesTest#testMultiValuesWithName
-org.apache.jackrabbit.test.api.GetWeakReferencesTest#testNonReferenceable
 org.apache.jackrabbit.test.api.GetWeakReferencesTest#testSingleValue
-org.apache.jackrabbit.test.api.GetWeakReferencesTest#testSingleValueWithName
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetSecondsRemaining
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetSecondsRemainingAfterUnlock
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLockOwningSession
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testLockExpiration
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetSecondsRemaining
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetSecondsRemainingAfterUnlock
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLockOwningSession
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testLockExpiration
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetSecondsRemaining
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetSecondsRemainingAfterUnlock
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLockOwningSession
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testLockExpiration
-org.apache.jackrabbit.test.api.NamePropertyTest#testGetNode
-org.apache.jackrabbit.test.api.NodeSetPrimaryTypeTest#testAddNonExisting
-org.apache.jackrabbit.test.api.NodeSetPrimaryTypeTest#testCheckedIn
-org.apache.jackrabbit.test.api.NodeSetPrimaryTypeTest#testLocked
-org.apache.jackrabbit.test.api.NodeSetPrimaryTypeTest#testSetAbstractAsPrimaryType
-org.apache.jackrabbit.test.api.NodeSetPrimaryTypeTest#testSetCurrentType
-org.apache.jackrabbit.test.api.NodeSetPrimaryTypeTest#testSetCurrentTypeOnNew
-org.apache.jackrabbit.test.api.NodeSetPrimaryTypeTest#testSetMixinAsPrimaryType
-org.apache.jackrabbit.test.api.NodeSetPrimaryTypeTest#testSetPrimaryType
-org.apache.jackrabbit.test.api.nodetype.CanAddChildNodeCallWithNodeTypeTest#testCanAddAbstractType
-org.apache.jackrabbit.test.api.nodetype.CanRemoveItemTest#testMandatoryChildNode
-org.apache.jackrabbit.test.api.nodetype.CanRemoveItemTest#testMandatoryProperty
-org.apache.jackrabbit.test.api.nodetype.CanRemoveItemTest#testProtectedChildNode
-org.apache.jackrabbit.test.api.nodetype.CanRemoveItemTest#testProtectedProperty
-org.apache.jackrabbit.test.api.nodetype.CanRemoveItemTest#testRemovableChildNode
-org.apache.jackrabbit.test.api.nodetype.CanRemoveItemTest#testRemovableProperty
-org.apache.jackrabbit.test.api.nodetype.NodeDefTest#testGetDefaultPrimaryTypes
-org.apache.jackrabbit.test.api.nodetype.NodeDefTest#testGetRequiredPrimaryTypeNames
 org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testEmptyNodeDefinitionTemplate
 org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testEmptyNodeTypeTemplate
 org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testEmptyPropertyDefinitionTemplate

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/BrokenRemoteRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/BrokenRemoteRepository.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/BrokenRemoteRepository.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/BrokenRemoteRepository.java Mon Feb 20 12:00:30 2012
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.rmi.client
 import java.rmi.RemoteException;
 
 import javax.jcr.Credentials;
+import javax.jcr.Value;
 
 import org.apache.jackrabbit.rmi.remote.RemoteRepository;
 import org.apache.jackrabbit.rmi.remote.RemoteSession;
@@ -130,4 +131,48 @@ public class BrokenRemoteRepository impl
         throw exception;
     }
 
+    /**
+     * Throws a {@link RemoteException}.
+     *
+     * @param key ignored
+     * @return nothing
+     * @throws RemoteException always thrown
+     */
+	public Value getDescriptorValue(String key) throws RemoteException {
+        throw exception;
+	}
+
+    /**
+     * Throws a {@link RemoteException}.
+     *
+     * @param key ignored
+     * @return nothing
+     * @throws RemoteException always thrown
+     */
+	public Value[] getDescriptorValues(String key) throws RemoteException {
+        throw exception;
+	}
+
+    /**
+     * Throws a {@link RemoteException}.
+     *
+     * @param key ignored
+     * @return nothing
+     * @throws RemoteException always thrown
+     */
+	public boolean isSingleValueDescriptor(String key) throws RemoteException {
+        throw exception;
+	}
+
+    /**
+     * Throws a {@link RemoteException}.
+     *
+     * @param key ignored
+     * @return nothing
+     * @throws RemoteException always thrown
+     */
+	public boolean isStandardDescriptor(String key) throws RemoteException {
+        throw exception;
+	}
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientLock.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientLock.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientLock.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientLock.java Mon Feb 20 12:00:30 2012
@@ -21,7 +21,6 @@ import java.rmi.RemoteException;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.lock.Lock;
 
 import org.apache.jackrabbit.rmi.remote.RemoteLock;
@@ -121,11 +120,21 @@ public class ClientLock extends ClientOb
         }
     }
 
+    /** {@inheritDoc} */
     public long getSecondsRemaining() throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+        try {
+            return remote.getSecondsRemaining();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public boolean isLockOwningSession() {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return remote.isLockOwningSession();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNode.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNode.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNode.java Mon Feb 20 12:00:30 2012
@@ -30,7 +30,6 @@ import javax.jcr.Property;
 import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.Value;
 import javax.jcr.lock.Lock;
 import javax.jcr.nodetype.NodeDefinition;
@@ -720,40 +719,80 @@ public class ClientNode extends ClientIt
         }
     }
 
+    /** {@inheritDoc} */
     public void followLifecycleTransition(String transition)
             throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+        try {
+        	remote.followLifecycleTransition(transition);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public String[] getAllowedLifecycleTransistions()
             throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+        try {
+        	return remote.getAllowedLifecycleTransistions();
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public NodeIterator getSharedSet() throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+        try {
+            return getFactory().getNodeIterator(getSession(), remote.getSharedSet());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public PropertyIterator getWeakReferences() throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+        try {
+            return getFactory().getPropertyIterator(getSession(), remote.getWeakReferences());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public PropertyIterator getWeakReferences(String name)
             throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+        try {
+            return getFactory().getPropertyIterator(getSession(), remote.getWeakReferences(name));
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public void removeShare() throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+        try {
+            remote.removeShare();
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public void removeSharedSet() throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+        try {
+            remote.removeSharedSet();
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public void setPrimaryType(String nodeTypeName)
             throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+        try {
+            remote.setPrimaryType(nodeTypeName);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java Mon Feb 20 12:00:30 2012
@@ -81,12 +81,22 @@ public class ClientNodeDefinition extend
         }
     }
 
+    /** {@inheritDoc} */
     public String getDefaultPrimaryTypeName() {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return remote.getDefaultPrimaryTypeName();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public String[] getRequiredPrimaryTypeNames() {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return remote.getRequiredPrimaryTypeNames();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java Mon Feb 20 12:00:30 2012
@@ -250,26 +250,52 @@ public class ClientNodeType extends Clie
         }
     }
 
+    /** {@inheritDoc} */
     public boolean canRemoveNode(String nodeName) {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return remote.canRemoveNode(nodeName);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public boolean canRemoveProperty(String propertyName) {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return remote.canRemoveProperty(propertyName);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public NodeTypeIterator getDeclaredSubtypes() {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return getFactory().getNodeTypeIterator(remote.getDeclaredSubtypes());
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public NodeTypeIterator getSubtypes() {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return getFactory().getNodeTypeIterator(remote.getSubtypes());
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public String[] getDeclaredSupertypeNames() {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return remote.getDeclaredSupertypeNames();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public boolean isAbstract() {
         try {
             return remote.isAbstract();
@@ -278,7 +304,12 @@ public class ClientNodeType extends Clie
         }
     }
 
+    /** {@inheritDoc} */
     public boolean isQueryable() {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return remote.isQueryable();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java Mon Feb 20 12:00:30 2012
@@ -85,16 +85,31 @@ public class ClientPropertyDefinition ex
         }
     }
 
+    /** {@inheritDoc} */
     public String[] getAvailableQueryOperators() {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return remote.getAvailableQueryOperators();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public boolean isFullTextSearchable() {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return remote.isFullTextSearchable();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
+    /** {@inheritDoc} */
     public boolean isQueryOrderable() {
-        throw new RuntimeException("TODO: JCRRMI-26");
+        try {
+            return remote.isQueryOrderable();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientQuery.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientQuery.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientQuery.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientQuery.java Mon Feb 20 12:00:30 2012
@@ -104,6 +104,7 @@ public class ClientQuery extends ClientO
         }
     }
 
+    /** {@inheritDoc} */
     public void bindValue(String varName, Value value)
             throws RepositoryException {
         throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientRepository.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientRepository.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientRepository.java Mon Feb 20 12:00:30 2012
@@ -136,11 +136,10 @@ public class ClientRepository implements
 
     /** {@inheritDoc} */
     public Value[] getDescriptorValues(String key) {
-        Value value = getDescriptorValue(key);
-        if (value != null) {
-            return new Value[] { value };
-        } else {
-            return null;
+        try {
+            return remote.getDescriptorValues(key);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
         }
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionManager.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionManager.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionManager.java Mon Feb 20 12:00:30 2012
@@ -45,11 +45,13 @@ public class ClientVersionManager extend
         this.remote = remote;
     }
 
+    /** {@inheritDoc} */
     public void cancelMerge(String absPath, Version version)
             throws RepositoryException {
         throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
     }
 
+    /** {@inheritDoc} */
     public Version checkin(String absPath) throws RepositoryException {
         try {
             return getFactory().getVersion(session, remote.checkin(absPath));
@@ -58,6 +60,7 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public void checkout(String absPath) throws RepositoryException {
         try {
             remote.checkout(absPath);
@@ -66,6 +69,7 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public Version checkpoint(String absPath) throws RepositoryException {
         try {
             return getFactory().getVersion(session, remote.checkpoint(absPath));
@@ -74,6 +78,7 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public Node createActivity(String title)
             throws RepositoryException {
         try {
@@ -83,6 +88,7 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public Node createConfiguration(String absPath)
             throws RepositoryException {
         try {
@@ -93,11 +99,13 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public void doneMerge(String absPath, Version version)
             throws RepositoryException {
         throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
     }
 
+    /** {@inheritDoc} */
     public Node getActivity() throws RepositoryException {
         try {
             return getFactory().getNode(session, remote.getActivity());
@@ -106,6 +114,7 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public Version getBaseVersion(String absPath) throws RepositoryException {
         try {
             return getFactory().getVersion(
@@ -115,6 +124,7 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public VersionHistory getVersionHistory(String absPath)
             throws RepositoryException {
         try {
@@ -125,6 +135,7 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public boolean isCheckedOut(String absPath) throws RepositoryException {
         try {
             return remote.isCheckedOut(absPath);
@@ -133,10 +144,12 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public NodeIterator merge(Node activityNode) throws RepositoryException {
         throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
     }
 
+    /** {@inheritDoc} */
     public NodeIterator merge(
             String absPath, String srcWorkspace, boolean bestEffort)
             throws RepositoryException {
@@ -148,6 +161,7 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public NodeIterator merge(
             String absPath, String srcWorkspace, boolean bestEffort,
             boolean isShallow) throws RepositoryException {
@@ -159,20 +173,24 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public void removeActivity(Node activityNode) throws RepositoryException {
         throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
     }
 
+    /** {@inheritDoc} */
     public void restore(Version[] versions, boolean removeExisting)
             throws RepositoryException {
         throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
     }
 
+    /** {@inheritDoc} */
     public void restore(Version version, boolean removeExisting)
             throws RepositoryException {
         throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
     }
 
+    /** {@inheritDoc} */
     public void restore(
             String absPath, String versionName, boolean removeExisting)
             throws RepositoryException {
@@ -183,11 +201,13 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public void restore(String absPath, Version version, boolean removeExisting)
             throws RepositoryException {
         throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
     }
 
+    /** {@inheritDoc} */
     public void restoreByLabel(
             String absPath, String versionLabel, boolean removeExisting)
             throws RepositoryException {
@@ -198,6 +218,7 @@ public class ClientVersionManager extend
         }
     }
 
+    /** {@inheritDoc} */
     public Node setActivity(Node activity) throws RepositoryException {
         throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
     }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SafeClientRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SafeClientRepository.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SafeClientRepository.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SafeClientRepository.java Mon Feb 20 12:00:30 2012
@@ -137,20 +137,64 @@ public abstract class SafeClientReposito
         return login(null, null);
     }
 
-    public Value getDescriptorValue(String key) {
-        throw new RuntimeException("TODO: JCRRMI-26");
+    /** {@inheritDoc} */
+    public synchronized Value getDescriptorValue(String key) {
+        try {
+            return remote.getDescriptorValue(key);
+        } catch (RemoteException e1) {
+            try {
+                remote = getRemoteRepository();
+                return remote.getDescriptorValue(key);
+            } catch (RemoteException e2) {
+                remote = new BrokenRemoteRepository(e2);
+                throw new RemoteRuntimeException(e2);
+            }
+        }
     }
 
-    public Value[] getDescriptorValues(String key) {
-        throw new RuntimeException("TODO: JCRRMI-26");
+    /** {@inheritDoc} */
+    public synchronized Value[] getDescriptorValues(String key) {
+        try {
+            return remote.getDescriptorValues(key);
+        } catch (RemoteException e1) {
+            try {
+                remote = getRemoteRepository();
+                return remote.getDescriptorValues(key);
+            } catch (RemoteException e2) {
+                remote = new BrokenRemoteRepository(e2);
+                throw new RemoteRuntimeException(e2);
+            }
+        }
     }
 
-    public boolean isSingleValueDescriptor(String key) {
-        throw new RuntimeException("TODO: JCRRMI-26");
+    /** {@inheritDoc} */
+    public synchronized boolean isSingleValueDescriptor(String key) {
+        try {
+            return remote.isSingleValueDescriptor(key);
+        } catch (RemoteException e1) {
+            try {
+                remote = getRemoteRepository();
+                return remote.isSingleValueDescriptor(key);
+            } catch (RemoteException e2) {
+                remote = new BrokenRemoteRepository(e2);
+                throw new RemoteRuntimeException(e2);
+            }
+        }
     }
 
-    public boolean isStandardDescriptor(String key) {
-        throw new RuntimeException("TODO: JCRRMI-26");
+    /** {@inheritDoc} */
+    public synchronized boolean isStandardDescriptor(String key) {
+        try {
+            return remote.isStandardDescriptor(key);
+        } catch (RemoteException e1) {
+            try {
+                remote = getRemoteRepository();
+                return remote.isStandardDescriptor(key);
+            } catch (RemoteException e2) {
+                remote = new BrokenRemoteRepository(e2);
+                throw new RemoteRuntimeException(e2);
+            }
+        }
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/security/ClientPrivilege.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/security/ClientPrivilege.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/security/ClientPrivilege.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/security/ClientPrivilege.java Mon Feb 20 12:00:30 2012
@@ -108,8 +108,4 @@ public class ClientPrivilege extends Cli
     public int hashCode() {
         return getName().hashCode();
     }
-
-    RemotePrivilege getRemotePrivilege() {
-        return rp;
-    }
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java Mon Feb 20 12:00:30 2012
@@ -108,5 +108,24 @@ public interface RemoteLock extends Remo
      */
     boolean isSessionScoped() throws RemoteException;
 
+    /**
+     * Remote version of the
+     * {@link javax.jcr.lock.Lock#getSecondsRemaining()} () Lock.getSecondsRemaining()} method.
+     *
+     * @return the number of seconds remaining until this lock times out.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	long getSecondsRemaining() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.lock.Lock#isLockOwningSession()} () Lock.isLockOwningSession()} method.
+     *
+     * @return a <code>boolean</code>.
+     * @throws RemoteException on RMI errors
+     */
+	boolean isLockOwningSession() throws RemoteException;
+
 
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java Mon Feb 20 12:00:30 2012
@@ -652,4 +652,92 @@ public interface RemoteNode extends Remo
      */
     RemoteLock getLock() throws RepositoryException, RemoteException;
 
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Node#getSharedSet() Node.getSharedSet()} method.
+     *
+     * @return a <code>NodeIterator</code>.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	RemoteIterator getSharedSet() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Node#followLifecycleTransition(String) Node.followLifecycleTransition(String)}
+     * method.
+     *
+     * @param transition a state transition
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	void followLifecycleTransition(String transition) throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Node#getAllowedLifecycleTransistions() Node.getAllowedLifecycleTransistions()}
+     * method.
+     *
+     * @return a <code>String</code> array.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	String[] getAllowedLifecycleTransistions() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Node#getWeakReferences() Node.getWeakReferences()}
+     * method.
+     *
+     * @return A <code>PropertyIterator</code>.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	RemoteIterator getWeakReferences() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Node#getWeakReferences(String) Node.getWeakReferences(String)}
+     * method.
+     *
+     * @param name name of referring <code>WEAKREFERENCE</code> properties to be
+     *             returned; if <code>null</code> then all referring
+     *             <code>WEAKREFERENCE</code>s are returned.
+     * @return A <code>PropertyIterator</code>.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	RemoteIterator getWeakReferences(String name) throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Node#removeShare() Node.removeShare()}
+     * method.
+     *
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	void removeShare() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Node#removeSharedSet() Node.removeSharedSet()}
+     * method.
+     *
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	void removeSharedSet() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Node#setPrimaryType(String) Node.setPrimaryType(String)}
+     * method.
+     *
+     * @param the nodeTypeName
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	void setPrimaryType(String nodeTypeName) throws RepositoryException, RemoteException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java Mon Feb 20 12:00:30 2012
@@ -71,4 +71,24 @@ public interface RemoteNodeDefinition ex
      */
     boolean allowsSameNameSiblings() throws RemoteException;
 
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeDefinition#getDefaultPrimaryTypeName() NodeDef.getDefaultPrimaryTypeName()}
+     * method.
+     *
+     * @return a String
+     * @throws RemoteException on RMI errors
+     */
+	String getDefaultPrimaryTypeName() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeDefinition#getRequiredPrimaryTypeNames() NodeDef.getRequiredPrimaryTypeNames()}
+     * method.
+     *
+     * @return a String array
+     * @throws RemoteException on RMI errors
+     */
+	String[] getRequiredPrimaryTypeNames() throws RemoteException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java Mon Feb 20 12:00:30 2012
@@ -227,4 +227,64 @@ public interface RemoteNodeType extends 
      */
     String getPrimaryItemName() throws RemoteException;
 
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeType#canRemoveNode() NodeType.canRemoveNode()}
+     * method.
+     *
+     * @return boolean
+     * @throws RemoteException on RMI errors
+     */
+	boolean canRemoveNode(String nodeName) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeType#canRemoveProperty() NodeType.canRemoveProperty()}
+     * method.
+     *
+     * @return boolean
+     * @throws RemoteException on RMI errors
+     */
+	boolean canRemoveProperty(String propertyName) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeType#getDeclaredSupertypeNames() NodeType.getDeclaredSupertypeNames()}
+     * method.
+     *
+     * @return a String[]
+     * @throws RemoteException on RMI errors
+     */
+	String[] getDeclaredSupertypeNames() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeType#isQueryable() NodeType.isQueryable()}
+     * method.
+     *
+     * @return boolean
+     * @throws RemoteException on RMI errors
+     */
+	boolean isQueryable() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeType#getDeclaredSubtypes() NodeType.getDeclaredSubtypes()}
+     * method.
+     *
+     * @return RemoteIterator
+     * @throws RemoteException on RMI errors
+     */
+	RemoteIterator getDeclaredSubtypes() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeType#getSubtypes() NodeType.getSubtypes()}
+     * method.
+     *
+     * @return RemoteIterator
+     * @throws RemoteException on RMI errors
+     */
+	RemoteIterator getSubtypes() throws RemoteException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java Mon Feb 20 12:00:30 2012
@@ -86,4 +86,34 @@ public interface RemotePropertyDefinitio
      */
     boolean isMultiple() throws RemoteException;
 
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinition#getAvailableQueryOperators() PropertyDefinition.getAvailableQueryOperators()}
+     * method.
+     *
+     * @return a String[]
+     * @throws RemoteException on RMI errors
+     */
+	String[] getAvailableQueryOperators() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinition#isFullTextSearchable() PropertyDefinition.isFullTextSearchable()}
+     * method.
+     *
+     * @return a boolean
+     * @throws RemoteException on RMI errors
+     */
+	boolean isFullTextSearchable() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinition#isQueryOrderable() PropertyDefinition.isQueryOrderable()}
+     * method.
+     *
+     * @return a boolean
+     * @throws RemoteException on RMI errors
+     */
+	boolean isQueryOrderable() throws RemoteException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRepository.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRepository.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRepository.java Mon Feb 20 12:00:30 2012
@@ -21,6 +21,7 @@ import java.rmi.RemoteException;
 
 import javax.jcr.Credentials;
 import javax.jcr.RepositoryException;
+import javax.jcr.Value;
 
 /**
  * Remote version of the JCR {@link javax.jcr.Repository Repository} interface.
@@ -115,4 +116,45 @@ public interface RemoteRepository extend
     RemoteSession login(Credentials credentials, String workspace)
             throws RepositoryException, RemoteException;
 
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Repository#getDescriptorValue(String) Repository.getDescriptorValue(String)}
+     * method.
+     *
+     * @return descriptor value
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	Value getDescriptorValue(String key) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Repository#getDescriptorValues(String) Repository.getDescriptorValues(String)}
+     * method.
+     *
+     * @return descriptor value array
+     * @throws RemoteException on RMI errors
+     */
+	Value[] getDescriptorValues(String key) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Repository#isSingleValueDescriptor(String) Repository.isSingleValueDescriptor(String)}
+     * method.
+     *
+     * @return boolean
+     * @throws RemoteException on RMI errors
+     */
+	boolean isSingleValueDescriptor(String key) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.Repository#isStandardDescriptor(String) Repository.isStandardDescriptor(String)}
+     * method.
+     *
+     * @return boolean
+     * @throws RemoteException on RMI errors
+     */
+	boolean isStandardDescriptor(String key) throws RemoteException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java Mon Feb 20 12:00:30 2012
@@ -55,4 +55,61 @@ public interface RemoteRow extends Remot
      */
     Value getValue(String propertyName)
             throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.Row#getNode()
+     *
+     * @return a node
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	RemoteNode getNode() throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.Row#getNode(String)
+     *
+     * @param selectorName
+     * @return a node
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	RemoteNode getNode(String selectorName) throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.Row#getPath()
+     *
+     * @return the path
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	String getPath() throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.Row#getPath(String)
+     *
+     * @param selectorName
+     * @return the path
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	String getPath(String selectorName) throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.Row#getScore()
+     *
+     * @return the score
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	double getScore() throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.Row#getScore(String)
+     *
+     * @param selectorName
+     * @return the score
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+	double getScore(String selectorName) throws RepositoryException, RemoteException;
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerLock.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerLock.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerLock.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerLock.java Mon Feb 20 12:00:30 2012
@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.rmi.server;
 
 import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.lock.Lock;
@@ -85,4 +84,15 @@ public class ServerLock extends ServerOb
     public boolean isSessionScoped() throws RemoteException {
         return lock.isSessionScoped();
     }
+
+    /** {@inheritDoc} */
+    public long getSecondsRemaining() throws RepositoryException, RemoteException {
+        return lock.getSecondsRemaining();
+    }
+
+    /** {@inheritDoc} */
+	public boolean isLockOwningSession() throws RemoteException {
+        return lock.isLockOwningSession();
+	}
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNode.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNode.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNode.java Mon Feb 20 12:00:30 2012
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.rmi.server
 import java.rmi.RemoteException;
 
 import javax.jcr.Node;
+import javax.jcr.NodeIterator;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -573,6 +574,85 @@ public class ServerNode extends ServerIt
         }
     }
 
+    /** {@inheritDoc} */
+    public RemoteIterator getSharedSet() 
+    		throws RepositoryException, RemoteException {
+    	try {
+    		NodeIterator sharedSet = node.getSharedSet();
+    		return getFactory().getRemoteNodeIterator(sharedSet);
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);
+    	}
+    }
+
+    /** {@inheritDoc} */
+    public void followLifecycleTransition(String transition)
+    		throws RepositoryException, RemoteException {
+    	try {
+    		node.followLifecycleTransition(transition);
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);
+    	}
+    }
+
+    /** {@inheritDoc} */
+	public String[] getAllowedLifecycleTransistions()
+			throws RepositoryException, RemoteException {
+    	try {
+    		return node.getAllowedLifecycleTransistions();
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public RemoteIterator getWeakReferences() 
+			throws RepositoryException, RemoteException {
+    	try {
+    		return getFactory().getRemotePropertyIterator(node.getWeakReferences());
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public RemoteIterator getWeakReferences(String name)
+			throws RepositoryException, RemoteException {
+    	try {
+    		return getFactory().getRemotePropertyIterator(node.getWeakReferences(name));
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public void removeShare() throws RepositoryException, RemoteException {
+    	try {
+    		node.removeShare();
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public void removeSharedSet() throws RepositoryException, RemoteException {
+    	try {
+    		node.removeSharedSet();
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public void setPrimaryType(String nodeTypeName) 
+			throws RepositoryException, RemoteException {
+    	try {
+    		node.setPrimaryType(nodeTypeName);
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);
+    	}
+	}
+
     //---------- Implementation helper -----------------------------------------
 
     /**
@@ -602,4 +682,5 @@ public class ServerNode extends ServerIt
         // otherwise fail
         throw new RepositoryException("Cannot find version " + versionUUID);
     }
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java Mon Feb 20 12:00:30 2012
@@ -72,4 +72,14 @@ public class ServerNodeDefinition extend
         return def.allowsSameNameSiblings();
     }
 
+    /** {@inheritDoc} */
+	public String getDefaultPrimaryTypeName() throws RemoteException {
+        return def.getDefaultPrimaryTypeName();
+	}
+
+    /** {@inheritDoc} */
+	public String[] getRequiredPrimaryTypeNames() throws RemoteException {
+        return def.getRequiredPrimaryTypeNames();
+	}
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java Mon Feb 20 12:00:30 2012
@@ -23,6 +23,7 @@ import javax.jcr.nodetype.NodeDefinition
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.PropertyDefinition;
 
+import org.apache.jackrabbit.rmi.remote.RemoteIterator;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
 import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
@@ -197,4 +198,34 @@ public class ServerNodeType extends Serv
         return type.getPrimaryItemName();
     }
 
+    /** {@inheritDoc} */
+	public boolean canRemoveNode(String nodeName) {
+		return type.canRemoveNode(nodeName);
+	}
+
+    /** {@inheritDoc} */
+	public boolean canRemoveProperty(String propertyName) {
+		return type.canRemoveProperty(propertyName);
+	}
+
+    /** {@inheritDoc} */
+	public String[] getDeclaredSupertypeNames() {
+		return type.getDeclaredSupertypeNames();
+	}
+
+    /** {@inheritDoc} */
+	public boolean isQueryable() {
+		return type.isQueryable();
+	}
+
+    /** {@inheritDoc} */
+	public RemoteIterator getDeclaredSubtypes() throws RemoteException {
+       	return getFactory().getRemoteNodeTypeIterator(type.getDeclaredSubtypes());
+	}
+
+    /** {@inheritDoc} */
+	public RemoteIterator getSubtypes() throws RemoteException {
+		return getFactory().getRemoteNodeTypeIterator(type.getSubtypes());
+	}
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java Mon Feb 20 12:00:30 2012
@@ -23,7 +23,6 @@ import javax.jcr.Value;
 import javax.jcr.nodetype.PropertyDefinition;
 
 import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
-import org.apache.jackrabbit.rmi.value.SerialValueFactory;
 
 /**
  * Remote adapter for the JCR
@@ -79,4 +78,19 @@ public class ServerPropertyDefinition ex
         return def.isMultiple();
     }
 
+    /** {@inheritDoc} */
+	public String[] getAvailableQueryOperators() throws RemoteException {
+		return def.getAvailableQueryOperators();
+	}
+
+    /** {@inheritDoc} */
+	public boolean isFullTextSearchable() throws RemoteException {
+		return def.isFullTextSearchable();
+	}
+
+    /** {@inheritDoc} */
+	public boolean isQueryOrderable() throws RemoteException {
+		return def.isQueryOrderable();
+	}
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java Mon Feb 20 12:00:30 2012
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.rmi.server
 import java.rmi.RemoteException;
 
 import javax.jcr.RepositoryException;
+import javax.jcr.Value;
 import javax.jcr.query.Query;
 
 import org.apache.jackrabbit.rmi.remote.RemoteQuery;
@@ -80,4 +81,30 @@ public class ServerQuery extends ServerO
         return getRemoteNode(query.storeAsNode(absPath));
     }
 
+    /** {@inheritDoc} */
+	public void bindValue(String varName, Value value)
+			throws RepositoryException, RemoteException {
+		query.bindValue(varName, value);
+	}
+
+    /** {@inheritDoc} */
+	public String[] getBindVariableNames() 
+			throws RepositoryException, RemoteException {
+        try {
+        	return query.getBindVariableNames();
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+	}
+
+    /** {@inheritDoc} */
+	public void setLimit(long limit) throws RemoteException {
+    	query.setLimit(limit);
+	}
+
+    /** {@inheritDoc} */
+	public void setOffset(long offset) throws RemoteException {
+		query.setOffset(offset);
+	}
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java Mon Feb 20 12:00:30 2012
@@ -68,4 +68,9 @@ public class ServerQueryResult extends S
         return getFactory().getRemoteNodeIterator(result.getNodes());
     }
 
+    /** {@inheritDoc} */
+	public String[] getSelectorNames() throws RepositoryException, RemoteException {
+		return result.getSelectorNames();
+	}
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRepository.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRepository.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRepository.java Mon Feb 20 12:00:30 2012
@@ -22,9 +22,11 @@ import javax.jcr.Credentials;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.Value;
 
 import org.apache.jackrabbit.rmi.remote.RemoteRepository;
 import org.apache.jackrabbit.rmi.remote.RemoteSession;
+import org.apache.jackrabbit.rmi.value.SerialValueFactory;
 
 /**
  * Remote adapter for the JCR {@link javax.jcr.Repository Repository}
@@ -108,4 +110,32 @@ public class ServerRepository extends Se
         }
     }
 
+    /** {@inheritDoc} */
+	public Value getDescriptorValue(String key) throws RemoteException {
+    	try {
+            return SerialValueFactory.makeSerialValue(repository.getDescriptorValue(key));
+    	} catch (RepositoryException ex) {
+    		 throw new RemoteException(ex.getMessage(), ex);    		
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public Value[] getDescriptorValues(String key) throws RemoteException {
+    	try {
+            return SerialValueFactory.makeSerialValueArray(repository.getDescriptorValues(key));
+    	} catch (RepositoryException ex) {
+    		throw new RemoteException(ex.getMessage(), ex);    		
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public boolean isSingleValueDescriptor(String key) throws RemoteException {
+		return repository.isSingleValueDescriptor(key);
+	}
+
+    /** {@inheritDoc} */
+	public boolean isStandardDescriptor(String key) throws RemoteException {
+		return repository.isStandardDescriptor(key);
+	}
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRow.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRow.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRow.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRow.java Mon Feb 20 12:00:30 2012
@@ -22,6 +22,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.jcr.query.Row;
 
+import org.apache.jackrabbit.rmi.remote.RemoteNode;
 import org.apache.jackrabbit.rmi.remote.RemoteRow;
 import org.apache.jackrabbit.rmi.value.SerialValueFactory;
 
@@ -54,12 +55,80 @@ public class ServerRow extends ServerObj
 
     /** {@inheritDoc} */
     public Value[] getValues() throws RepositoryException, RemoteException {
-        return getSerialValues(row.getValues());
+    	try {
+    		return getSerialValues(row.getValues());
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);    		
+    	}
     }
 
     /** {@inheritDoc} */
     public Value getValue(String propertyName)
             throws RepositoryException, RemoteException {
-        return SerialValueFactory.makeSerialValue(row.getValue(propertyName));
+    	try {
+    		return SerialValueFactory.makeSerialValue(row.getValue(propertyName));
+    	} catch (RepositoryException ex) {
+    		 throw getRepositoryException(ex);    		
+    	}
     }
+
+    /** {@inheritDoc} */
+	public RemoteNode getNode() 
+			throws RepositoryException, RemoteException {
+    	try {
+    		return getRemoteNode(row.getNode());
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);    		
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public RemoteNode getNode(String selectorName) 
+			throws RepositoryException, RemoteException {
+    	try {
+    		return getRemoteNode(row.getNode(selectorName));
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);    		
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public String getPath() 
+			throws RepositoryException, RemoteException {
+    	try {
+    		return row.getPath();
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);    		
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public String getPath(String selectorName) 
+			throws RepositoryException, RemoteException {
+    	try {
+    		return row.getPath(selectorName);
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);    		
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public double getScore() 
+			throws RepositoryException, RemoteException {
+    	try {
+    		return row.getScore();
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);    		
+    	}
+	}
+
+    /** {@inheritDoc} */
+	public double getScore(String selectorName) 
+			throws RepositoryException, RemoteException {
+    	try {
+    		return row.getScore(selectorName);
+    	} catch (RepositoryException ex) {
+    		throw getRepositoryException(ex);    		
+    	}
+	}
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionManager.java?rev=1291222&r1=1291221&r2=1291222&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionManager.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionManager.java Mon Feb 20 12:00:30 2012
@@ -164,4 +164,12 @@ public class ServerVersionManager extend
         }
     }
 
+	public void cancelMerge(String absPath, RemoteVersion version)
+			throws RepositoryException, RemoteException {
+	}
+
+	public void doneMerge(String absPath, RemoteVersion version)
+			throws RepositoryException, RemoteException {
+	}
+
 }



Mime
View raw message