Index: pom.xml
===================================================================
--- pom.xml	(revision 1377741)
+++ pom.xml	(working copy)
@@ -158,22 +158,6 @@
 org.apache.jackrabbit.test.api.GetWeakReferencesTest#testMultiValues
 org.apache.jackrabbit.test.api.GetWeakReferencesTest#testSingleValue
 
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testEmptyNodeDefinitionTemplate
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testEmptyNodeTypeTemplate
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testEmptyPropertyDefinitionTemplate
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testInvalidJCRNames
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testNewNodeTypeTemplate
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testNodeDefinitionTemplate
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testNonEmptyNodeTypeTemplate
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testPropertyDefinitionTemplate
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testRegisterNodeType
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testRegisterNodeTypes
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testResidualNames
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testSetDefaultValues
-
-org.apache.jackrabbit.test.api.observation.GetUserDataTest#testSave
-org.apache.jackrabbit.test.api.observation.GetUserDataTest#testVersioning
-org.apache.jackrabbit.test.api.observation.GetUserDataTest#testWorkspaceOperation
 org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderMove
 
 org.apache.jackrabbit.test.api.PathTest#testResolvedIdentifierBasedPropertyValue
@@ -459,9 +443,6 @@
 org.apache.jackrabbit.test.api.query.XPathQueryLevel2Test#testRange
 org.apache.jackrabbit.test.api.query.XPathQueryLevel2Test#testScoreColumn
 
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testSetIllegalPolicy
-org.apache.jackrabbit.test.api.security.RSessionAccessControlPolicyTest#testSetInvalidPolicy
-
 org.apache.jackrabbit.test.api.SerializationTest#testLockExceptionSessionWithHandler
 org.apache.jackrabbit.test.api.SerializationTest#testLockExceptionWorkspaceWithHandler
 org.apache.jackrabbit.test.api.SerializationTest#testVersioningExceptionFileChildSessionContentHandler
@@ -473,39 +454,6 @@
 
 org.apache.jackrabbit.test.api.version.CopyTest#testCopy
 org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetAllFrozenNodes
-
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testSetPolicy
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testSetAllPolicies
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testGetPolicyAfterSet
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testResetPolicy
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testSetPolicyIsTransient
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testGetPolicyAfterSave
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testNodeIsModifiedAfterSecondSetPolicy
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testNodeIsModifiedAfterSetPolicy
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testRemovePolicy
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testRemovePolicyIsTransient
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testNodeIsModifiedAfterRemovePolicy
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testSetPolicyOnNewNode
-org.apache.jackrabbit.test.api.security.AccessControlPolicyTest#testRemoveTransientlyAddedPolicy
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testAddAccessControlEntry
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testAddAggregatePrivilege
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testAddAggregatedPrivilegesSeparately
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testAddPrivilegesPresentInEntries
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testAddAccessControlEntryAndSetPolicy
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testAddAccessControlEntryIsTransient
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testAddAccessControlEntryInvalidPrincipal
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testAddAccessControlEntryEmptyPrivilegeArray
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testAddAccessControlEntryInvalidPrivilege
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testRemoveAddedAccessControlEntry
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testRemoveAccessControlEntryAndSetPolicy
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testRemoveAccessControlEntryIsTransient
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testRemoveIllegalAccessControlEntry
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testAddAccessControlEntryTwice
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testAddAccessControlEntryAgain
-org.apache.jackrabbit.test.api.security.AccessControlListTest#testExtendPrivileges
-org.apache.jackrabbit.test.api.security.RSessionAccessControlPolicyTest#testSetPolicy
-<!-- JCR-3206 -->
-org.apache.jackrabbit.test.api.observation.EventJournalTest
                   </value>
                 </property>
                 <property>
@@ -541,6 +489,10 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+    	<groupId>commons-collections</groupId>
+    	<artifactId>commons-collections</artifactId>
+    </dependency>
     <!--
       We use the RangeIteratorAdapter but include it in the library thus
       users of the jackrabbit-jcr-rmi library do not need to get the
Index: src/test/java/org/apache/jackrabbit/rmi/RepositoryStubImpl.java
===================================================================
--- src/test/java/org/apache/jackrabbit/rmi/RepositoryStubImpl.java	(revision 1376990)
+++ src/test/java/org/apache/jackrabbit/rmi/RepositoryStubImpl.java	(working copy)
@@ -74,8 +74,8 @@
                 ObjectInputStream ois = new ObjectInputStream(
                         new ByteArrayInputStream(buffer.toByteArray()));
                 LocalAdapterFactory laf = new ClientAdapterFactory();
-                repository =
-                    laf.getRepository((RemoteRepository) ois.readObject());
+                repository = laf.getRepository((RemoteRepository) ois.readObject());
+                principal = laf.getPrincipal(raf.getPrincipal(principal));
             } catch (Exception e) {
                 throw new RepositoryStubException(e.getMessage());
             }
Index: src/main/java/org/apache/jackrabbit/rmi/remote/security/RemotePrivilege.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/security/RemotePrivilege.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/security/RemotePrivilege.java	(working copy)
@@ -44,26 +44,30 @@
     /**
      * @see javax.jcr.security.Privilege#getAggregatePrivileges()
      */
-    public RemotePrivilege[] getAggregatePrivileges() throws RemoteException;
+    RemotePrivilege[] getAggregatePrivileges() throws RemoteException;
 
     /**
      * @see javax.jcr.security.Privilege#getDeclaredAggregatePrivileges()
      */
-    public RemotePrivilege[] getDeclaredAggregatePrivileges()
+    RemotePrivilege[] getDeclaredAggregatePrivileges()
             throws RemoteException;
 
     /**
      * @see javax.jcr.security.Privilege#getName()
      */
-    public String getName() throws RemoteException;
+    String getName() throws RemoteException;
 
     /**
      * @see javax.jcr.security.Privilege#isAbstract()
      */
-    public boolean isAbstract() throws RemoteException;
+    boolean isAbstract() throws RemoteException;
 
     /**
      * @see javax.jcr.security.Privilege#isAggregate()
      */
-    public boolean isAggregate() throws RemoteException;
+    boolean isAggregate() throws RemoteException;
+
+    boolean isEqual(RemotePrivilege privilege) throws RemoteException;
+
+    int getHashCode() throws RemoteException;
 }
Index: src/main/java/org/apache/jackrabbit/rmi/remote/security/RemoteAccessControlEntry.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/security/RemoteAccessControlEntry.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/security/RemoteAccessControlEntry.java	(working copy)
@@ -19,7 +19,7 @@
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
-import org.apache.jackrabbit.rmi.remote.principal.RemotePrincipal;
+import org.apache.jackrabbit.rmi.client.SerializablePrincipal;
 
 /**
  * Remote version of the JCR {@link javax.jcr.security.AccessControlEntry
@@ -47,11 +47,14 @@
     /**
      * @see javax.jcr.security.AccessControlEntry#getPrincipal()
      */
-    public RemotePrincipal getPrincipal() throws RemoteException;
+    public SerializablePrincipal getPrincipal() throws RemoteException;
 
     /**
      * @see javax.jcr.security.AccessControlEntry#getPrivileges()
      */
     public RemotePrivilege[] getPrivileges() throws RemoteException;
 
+    public boolean isEqual(RemoteAccessControlEntry race) throws RemoteException;
+
+    public int getHashCode() throws RemoteException;
 }
Index: src/main/java/org/apache/jackrabbit/rmi/remote/security/RemoteAccessControlList.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/security/RemoteAccessControlList.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/security/RemoteAccessControlList.java	(working copy)
@@ -20,6 +20,8 @@
 
 import javax.jcr.RepositoryException;
 
+import org.apache.jackrabbit.rmi.client.SerializablePrincipal;
+
 /**
  * Remote version of the JCR {@link javax.jcr.security.AccessControlList
  * AccessControlList} interface. Used by the
@@ -48,4 +50,15 @@
     public RemoteAccessControlEntry[] getAccessControlEntries()
             throws RepositoryException, RemoteException;
 
+    public boolean addAccessControlEntry(
+            SerializablePrincipal principal,
+            RemotePrivilege[] privileges)
+            throws RepositoryException, RemoteException;
+
+    public void removeAccessControlEntry(RemoteAccessControlEntry ace)
+            throws RepositoryException, RemoteException;
+
+    public boolean isEqual(RemoteAccessControlList racl) throws RemoteException;
+
+    public int getHashCode() throws RemoteException;
 }
Index: src/main/java/org/apache/jackrabbit/rmi/remote/security/RemoteAccessControlManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/security/RemoteAccessControlManager.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/security/RemoteAccessControlManager.java	(working copy)
@@ -20,6 +20,7 @@
 import java.rmi.RemoteException;
 
 import javax.jcr.RepositoryException;
+
 import org.apache.jackrabbit.rmi.remote.RemoteIterator;
 
 /**
@@ -48,44 +49,58 @@
     /**
      * @see javax.jcr.security.AccessControlManager#getApplicablePolicies(String)
      */
-    public RemoteIterator getApplicablePolicies(String absPath)
+    RemoteIterator getApplicablePolicies(String absPath)
             throws RepositoryException, RemoteException;
 
     /**
      * @see javax.jcr.security.AccessControlManager#getEffectivePolicies(String)
      */
-    public RemoteAccessControlPolicy[] getEffectivePolicies(String absPath)
+    RemoteAccessControlPolicy[] getEffectivePolicies(String absPath)
             throws RepositoryException, RemoteException;
 
     /**
      * @see javax.jcr.security.AccessControlManager#getPolicies(String)
      */
-    public RemoteAccessControlPolicy[] getPolicies(String absPath)
+    RemoteAccessControlPolicy[] getPolicies(String absPath)
             throws RepositoryException, RemoteException;
 
     /**
      * @see javax.jcr.security.AccessControlManager#getPrivileges(String)
      */
-    public RemotePrivilege[] getPrivileges(String absPath)
+    RemotePrivilege[] getPrivileges(String absPath)
             throws RepositoryException, RemoteException;
 
     /**
      * @see javax.jcr.security.AccessControlManager#getSupportedPrivileges(String)
      */
-    public RemotePrivilege[] getSupportedPrivileges(String absPath)
+    RemotePrivilege[] getSupportedPrivileges(String absPath)
             throws RepositoryException, RemoteException;
 
     /**
      * @see javax.jcr.security.AccessControlManager#privilegeFromName(String)
      */
-    public RemotePrivilege privilegeFromName(String privilegeName)
+    RemotePrivilege privilegeFromName(String privilegeName)
             throws RepositoryException, RemoteException;
 
     /**
      * @see javax.jcr.security.AccessControlManager#hasPrivileges(String,
      *      javax.jcr.security.Privilege[])
      */
-    public boolean hasPrivileges(String absPath, String[] privileges)
+    boolean hasPrivileges(String absPath, String[] privileges)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.security.AccessControlManager#setPolicy(String,
+     *      javax.jcr.security.AccessControlPolicy)
+     */
+    void setPolicy(String absPath, RemoteAccessControlPolicy policy)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.security.AccessControlManager#removePolicy(String,
+     *      javax.jcr.security.AccessControlPolicy)
+     */
+    void removePolicy(String absPath, RemoteAccessControlPolicy policy)
             throws RepositoryException, RemoteException;
 
 }
Index: src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeTemplate.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeTemplate.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeTemplate.java	(revision 0)
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.remote;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.nodetype.ConstraintViolationException;
+
+/**
+ * Remote version of the JCR {@link javax.jcr.nodetype.NodeTypeTemplate
+ * NodeTypeTemplate} interface. Used by the
+ * {@link org.apache.jackrabbit.rmi.server.ServerNodeTypeTemplate
+ * ServerNodeTypeTemplate} and
+ * {@link org.apache.jackrabbit.rmi.client.ClientNodeTypeTemplate
+ * ClientNodeTypeTemplate} adapters to provide transparent RMI access to remote
+ * node type templates.
+ * <p>
+ * The methods in this interface are documented only with a reference to a
+ * corresponding NodeTypeTemplate method. The remote object will simply forward
+ * the method call to the underlying NodeTypeTemplate instance. Return values
+ * and possible exceptions are copied over the network. Complex return values
+ * (like NodeTypeTemplates, NodeDefinitions and PropertyDefinitions) are
+ * returned as remote references to the corresponding remote interfaces. RMI
+ * errors are signaled with RemoteExceptions.
+ *
+ * @see javax.jcr.nodetype.NodeTypeTemplate
+ * @see org.apache.jackrabbit.rmi.client.ClientNodeTypeTemplate
+ * @see org.apache.jackrabbit.rmi.server.ServerNodeTypeTemplate
+ */
+public interface RemoteNodeTypeTemplate extends RemoteNodeTypeDefinition {
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeTemplate#setName(String)
+     * NodeTypeTemplate.setName(String)} method.
+     *
+     * @param name a JCR name.
+     * @throws ConstraintViolationException on constraint violations
+     * @throws RemoteException on RMI errors
+     */
+    void setName(String name)
+            throws ConstraintViolationException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeTemplate
+     * #setDeclaredSuperTypeNames(String[])
+     * NodeTypeTemplate.setDeclaredSuperTypeNames(String[])} method.
+     *
+     * @param names an array of JCR names.
+     * @throws ConstraintViolationException on constraint violations
+     * @throws RemoteException on RMI errors
+     */
+    void setDeclaredSuperTypeNames(String[] names)
+            throws ConstraintViolationException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeTemplate#setAbstract(boolean)
+     * NodeTypeTemplate.setAbstract(boolean)} method.
+     *
+     * @param abstractStatus a boolean
+     * @throws RemoteException on RMI errors
+     */
+    void setAbstract(boolean abstractStatus) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeTemplate#setMixin(boolean)
+     * NodeTypeTemplate.setMixin(boolean)} method.
+     *
+     * @param mixin a boolean
+     * @throws RemoteException on RMI errors
+     */
+    void setMixin(boolean mixin) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeTemplate
+     * #setOrderableChildNodes(boolean)
+     * NodeTypeTemplate.setOrderableChildNodes(boolean)} method.
+     *
+     * @param orderable a boolean
+     * @throws RemoteException on RMI errors
+     */
+    void setOrderableChildNodes(boolean orderable) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeTemplate#setPrimaryItemName(String)
+     * NodeTypeTemplate.setPrimaryItemName(String)} method.
+     *
+     * @param name a JCR name
+     * @throws ConstraintViolationException on constraint violations
+     * @throws RemoteException on RMI errors
+     */
+    void setPrimaryItemName(String name)
+            throws ConstraintViolationException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeTemplate#setQueryable(boolean)
+     * NodeTypeTemplate.setQueryable(boolean)} method.
+     *
+     * @param queryable a boolean
+     * @throws RemoteException on RMI errors
+     */
+    void setQueryable(boolean queryable) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeTemplate
+     * #getPropertyDefinitionTemplates()
+     * NodeTypeTemplate.getPropertyDefinitionTemplates()} method.
+     *
+     * @return property definition templates
+     * @throws RemoteException on RMI errors
+     */
+    RemoteList<RemotePropertyDefinitionTemplate>
+        getPropertyDefinitionTemplates() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeTemplate#getNodeDefinitionTemplates()
+     * NodeTypeTemplate.getNodeDefinitionTemplates()} method.
+     *
+     * @return node definition templates
+     * @throws RemoteException on RMI errors
+     */
+    RemoteList<RemoteNodeDefinitionTemplate> getNodeDefinitionTemplates()
+            throws RemoteException;
+}
Index: src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeDefinition.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeDefinition.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeDefinition.java	(revision 0)
@@ -0,0 +1,123 @@
+package org.apache.jackrabbit.rmi.remote;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * Remote version of the JCR {@link javax.jcr.nodetype.NodeTypeDefinition
+ * NodeTypeDefinition} interface. Used by the
+ * {@link org.apache.jackrabbit.rmi.server.ServerNodeTypeDefinition
+ * ServerNodeTypeDefinition} and
+ * {@link org.apache.jackrabbit.rmi.client.ClientNodeTypeDefinition
+ * ClientNodeTypeDefinition} adapters to provide transparent RMI access to
+ * remote node type definitions.
+ * <p>
+ * The methods in this interface are documented only with a reference to a
+ * corresponding NodeTypeDefinition method. The remote object will simply
+ * forward the method call to the underlying NodeTypeDefinition instance.
+ * Return values and possible exceptions are copied over the network. Complex
+ * return values (like NodeTypeDefinitions and PropertyDefinitions) are
+ * returned as remote references to the corresponding remote interfaces.
+ * RMI errors are signaled with RemoteExceptions.
+ *
+ * @see javax.jcr.nodetype.NodeTypeDefinition
+ * @see org.apache.jackrabbit.rmi.client.ClientNodeTypeDefinition
+ * @see org.apache.jackrabbit.rmi.server.ServerNodeTypeDefinition
+ */
+public interface RemoteNodeTypeDefinition extends Remote {
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeDefinition#getName()
+     * NodeTypeDefinition.getName()} method.
+     *
+     * @return a String
+     * @throws RemoteException on RMI errors
+     */
+    String getName() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeDefinition#getDeclaredSupertypeNames()
+     * NodeTypeDefinition.getDeclaredSupertypeNames()} method.
+     *
+     * @return an array of Strings
+     * @throws RemoteException on RMI errors
+     */
+    String[] getDeclaredSupertypeNames() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeDefinition#isAbstract()
+     * NodeTypeDefinition.isAbstract()} method.
+     *
+     * @return a boolean
+     * @throws RemoteException on RMI errors
+     */
+    boolean isAbstract() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeDefinition#isMixin()
+     * NodeTypeDefinition.isMixin()} method.
+     *
+     * @return a <code>boolean</code>
+     * @throws RemoteException on RMI errors
+     */
+    boolean isMixin() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeDefinition#hasOrderableChildNodes()
+     * NodeTypeDefinition.hasOrderableChildNodes()} method.
+     *
+     * @return a <code>boolean</code>
+     * @throws RemoteException on RMI errors
+     */
+    boolean hasOrderableChildNodes() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeDefinition#isQueryable()
+     * NodeTypeDefinition.isQueryable()} method.
+     *
+     * @return a <code>boolean</code>
+     * @throws RemoteException on RMI errors
+     */
+    boolean isQueryable() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeDefinition#getPrimaryItemName()
+     * NodeTypeDefinition.getPrimaryItemName()} method.
+     *
+     * @return a <code>String</code>
+     * @throws RemoteException on RMI errors
+     */
+    String getPrimaryItemName() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeDefinition
+     * #getDeclaredPropertyDefinitions()
+     * NodeTypeDefinition.getDeclaredPropertyDefinitions()} method.
+     *
+     * @return an array of <code>PropertyDefinition</code>s
+     * @throws RemoteException on RMI errors
+     */
+    RemotePropertyDefinition[] getDeclaredPropertyDefinitions()
+            throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeDefinition
+     * #getDeclaredChildNodeDefinitions()
+     * NodeTypeDefinition.getDeclaredChildNodeDefinitions()} method.
+     *
+     * @return an array of <code>NodeDefinition</code>s
+     * @throws RemoteException on RMI errors
+     */
+    RemoteNodeDefinition[] getDeclaredChildNodeDefinitions()
+            throws RemoteException;
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventJournal.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventJournal.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventJournal.java	(revision 0)
@@ -0,0 +1,50 @@
+package org.apache.jackrabbit.rmi.remote;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.observation.Event;
+
+/**
+ * Remote version of the JCR {@link javax.jcr.observation.EventJournal
+ * EventJournal} interface. Used by the
+ * {@link org.apache.jackrabbit.rmi.server.ServerEventJournal
+ * ServerEventJournal} and
+ * {@link org.apache.jackrabbit.rmi.client.ClientEventJournal
+ * ClientEventJournal} adapter base classes to provide transparent RMI access
+ * to remote items.
+ * <p>
+ * The methods in this interface are documented only with a reference
+ * to a corresponding EventJournal method. The remote object will simply forward
+ * the method call to the underlying EventJournal instance. Argument and return
+ * values, as well as possible exceptions, are copied over the network.
+ * The complex return value Event is returned as a serializable object.
+ * RMI errors are signaled with RemoteExceptions.
+ *
+ * @see javax.jcr.Item
+ * @see org.apache.jackrabbit.rmi.client.ClientItem
+ * @see org.apache.jackrabbit.rmi.server.ServerItem
+ */
+public interface RemoteEventJournal extends RemoteIterator {
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.observation.EventIterator#nextEvent()
+     * EventIterator.nextEvent()} method.
+     *
+     * @return the next event
+     * @throws RemoteException on RMI errors
+     */
+    Event nextEvent() throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.observation.EventJournal#skipTo(long)
+     * EventJournal.skipTo(long)} method.
+     * {@link javax.jcr.Item#getPath() Item.getPath()} method.
+     *
+     * @param date a long value (unix timestamp)
+     * @throws RemoteException on RMI errors
+     */
+    void skipTo(long date) throws RemoteException;
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventCollection.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventCollection.java	(revision 1377741)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventCollection.java	(working copy)
@@ -18,9 +18,8 @@
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.util.Map;
 
-import javax.jcr.RepositoryException;
+import org.apache.jackrabbit.rmi.client.SerializableEvent;
 
 /**
  * The <code>RemoteEventCollection</code> class serves as a container for
@@ -47,83 +46,6 @@
      * @return list of events
      * @throws RemoteException on RMI errors
      */
-    RemoteEvent[] getEvents() throws RemoteException;
-
-    /**
-     * The <code>RemoteEvent</code> class provides an encapsulation of single
-     * events in an event list sent to a registered listener.
-     */
-    public static interface RemoteEvent extends Remote {
-        /**
-         * Remote version of the
-         * {@link javax.jcr.Event#getType() Event.getType()} method.
-         *
-         * @return the type of this event.
-         * @throws RemoteException on RMI errors
-         */
-        int getType() throws RemoteException;
-
-        /**
-         * Remote version of the
-         * {@link javax.jcr.Event#getPath() Event.getPath()} method.
-         *
-         * @return the absolute path associated with this event or
-         *         <code>null</code>.
-         * @throws RepositoryException on repository errors
-         * @throws RemoteException on RMI errors
-         */
-        String getPath() throws RepositoryException, RemoteException;
-
-        /**
-         * Remote version of the
-         * {@link javax.jcr.Event#getUserID() Event.getUserID()} method.
-         *
-         * @return the user ID.
-         * @throws RemoteException on RMI errors
-         */
-        String getUserID() throws RemoteException;
-        
-        /**
-         * Remote version of the
-         * {@link javax.jcr.Event#getIdentifier() Event.getIdentifier()} method.
-         *
-         * @return the identifier associated with this event or <code>null</code>.
-         * @throws RepositoryException on repository errors
-         * @throws RemoteException on RMI errors
-         */
-        String getIdentifier() throws RepositoryException, RemoteException;
-        
-        /**
-         * Remote version of the
-         * {@link javax.jcr.Event#getInfo() Event.getInfo()} method.
-         *
-         * @return A <code>Map</code> containing parameter information for instances
-     *         of a <code>NODE_MOVED</code> event.
-         * @throws RepositoryException on repository errors
-         * @throws RemoteException on RMI errors
-         */
-        Map getInfo() throws RepositoryException, RemoteException;
-        
-        /**
-         * Remote version of the
-         * {@link javax.jcr.Event#getUserData() Event.getUserData()} method.
-         *
-         * @return The user data string.
-         * @throws RepositoryException on repository errors
-         * @throws RemoteException on RMI errors
-         */
-        String getUserData() throws RepositoryException, RemoteException;
-        
-        /**
-         * Remote version of the
-         * {@link javax.jcr.Event#getDate() Event.getDate()} method.
-         *
-         * @return the date when the change was persisted that caused this event.
-         * @throws RepositoryException on repository errors
-         * @throws RemoteException on RMI errors
-         */
-        long getDate() throws RepositoryException, RemoteException;
-        
-    }
+    SerializableEvent[] getEvents() throws RemoteException;
 
 }
Index: src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java	(working copy)
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.rmi.remote;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
 import javax.jcr.Value;
@@ -40,7 +39,7 @@
  * @see org.apache.jackrabbit.rmi.client.ClientNodeType
  * @see org.apache.jackrabbit.rmi.server.ServerNodeType
  */
-public interface RemoteNodeType extends Remote {
+public interface RemoteNodeType extends RemoteNodeTypeDefinition {
 
     /**
      * Remote version of the
@@ -63,7 +62,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#isAbstract() NodeType.isAbstract()} method.
+     * {@link javax.jcr.nodetype.NodeType#isAbstract() NodeType.isAbstract()}
+     * method.
      *
      * @return <code>true</code> if this is an abstract type,
      *         <code>false</code> otherwise
@@ -73,8 +73,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#hasOrderableChildNodes() NodeType.hasOrderableChildNodes()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#hasOrderableChildNodes()
+     * NodeType.hasOrderableChildNodes()} method.
      *
      * @return <code>true</code> if nodes of this type has orderable
      *         child nodes, <code>false</code> otherwise
@@ -84,8 +84,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#getSupertypes() NodeType.getSupertypes()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#getSupertypes()
+     * NodeType.getSupertypes()} method.
      *
      * @return supertypes
      * @throws RemoteException on RMI errors
@@ -94,8 +94,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#getDeclaredSupertypes() NodeType.getDeclaredSupertypes()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#getDeclaredSupertypes()
+     * NodeType.getDeclaredSupertypes()} method.
      *
      * @return declared supertypes
      * @throws RemoteException on RMI errors
@@ -104,8 +104,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#isNodeType(String) NodeType.isNodeType(String)}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#isNodeType(String)
+     * NodeType.isNodeType(String)} method.
      *
      * @param type node type name
      * @return <code>true</code> if this node type is or extends the
@@ -116,8 +116,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#getPropertyDefs() NodeType.getPropertyDefs()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#getPropertyDefs()
+     * NodeType.getPropertyDefs()} method.
      *
      * @return property definitions
      * @throws RemoteException on RMI errors
@@ -126,8 +126,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#getDeclaredPropertyDefs() NodeType.getDeclaredPropertyDefs()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#getDeclaredPropertyDefs()
+     * NodeType.getDeclaredPropertyDefs()} method.
      *
      * @return declared property definitions
      * @throws RemoteException on RMI errors
@@ -136,8 +136,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#getChildNodeDefs() NodeType.getChildNodeDefs()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#getChildNodeDefs()
+     * NodeType.getChildNodeDefs()} method.
      *
      * @return child node definitions
      * @throws RemoteException on RMI errors
@@ -146,8 +146,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#getDeclaredChildNodeDefs() NodeType.getDeclaredChildNodeDefs()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#getDeclaredChildNodeDefs()
+     * NodeType.getDeclaredChildNodeDefs()} method.
      *
      * @return declared child node definitions
      * @throws RemoteException on RMI errors
@@ -156,8 +156,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#canSetProperty(String,Value) NodeType.canSetProperty(String,Value)}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#canSetProperty(String,Value)
+     * NodeType.canSetProperty(String,Value)} method.
      *
      * @param name property name
      * @param value property value
@@ -169,8 +169,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#canSetProperty(String,Value[]) NodeType.canSetProperty(String,Value[])}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#canSetProperty(String,Value[])
+     * NodeType.canSetProperty(String,Value[])} method.
      *
      * @param name property name
      * @param values property values
@@ -182,8 +182,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#canAddChildNode(String) NodeType.canAddChildNode(String)}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#canAddChildNode(String)
+     * NodeType.canAddChildNode(String)} method.
      *
      * @param name child node name
      * @return <code>true</code> if the child node can be added,
@@ -194,8 +194,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#canAddChildNode(String,String) NodeType.canAddChildNode(String,String)}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#canAddChildNode(String,String)
+     * NodeType.canAddChildNode(String,String)} method.
      *
      * @param name child node name
      * @param type child node type
@@ -207,8 +207,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#canRemoveItem(String) NodeType.canRemoveItem(String)}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#canRemoveItem(String)
+     * NodeType.canRemoveItem(String)} method.
      *
      * @param name item name
      * @return <code>true</code> if the item can be removed,
@@ -219,8 +219,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#getPrimaryItemName() NodeType.getPrimaryItemName()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#getPrimaryItemName()
+     * NodeType.getPrimaryItemName()} method.
      *
      * @return primary item name
      * @throws RemoteException on RMI errors
@@ -229,33 +229,35 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#canRemoveNode() NodeType.canRemoveNode()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#canRemoveNode()
+     * NodeType.canRemoveNode()} method.
      *
+     * @param nodeName node name
      * @return boolean
      * @throws RemoteException on RMI errors
      */
-	boolean canRemoveNode(String nodeName) throws RemoteException;
+    boolean canRemoveNode(String nodeName) throws RemoteException;
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#canRemoveProperty() NodeType.canRemoveProperty()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#canRemoveProperty()
+     * NodeType.canRemoveProperty()} method.
      *
+     * @param propertyName property name
      * @return boolean
      * @throws RemoteException on RMI errors
      */
-	boolean canRemoveProperty(String propertyName) throws RemoteException;
+    boolean canRemoveProperty(String propertyName) throws RemoteException;
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#getDeclaredSupertypeNames() NodeType.getDeclaredSupertypeNames()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#getDeclaredSupertypeNames()
+     * NodeType.getDeclaredSupertypeNames()} method.
      *
      * @return a String[]
      * @throws RemoteException on RMI errors
      */
-	String[] getDeclaredSupertypeNames() throws RemoteException;
+    String[] getDeclaredSupertypeNames() throws RemoteException;
 
     /**
      * Remote version of the
@@ -265,17 +267,17 @@
      * @return boolean
      * @throws RemoteException on RMI errors
      */
-	boolean isQueryable() throws RemoteException;
+    boolean isQueryable() throws RemoteException;
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeType#getDeclaredSubtypes() NodeType.getDeclaredSubtypes()}
-     * method.
+     * {@link javax.jcr.nodetype.NodeType#getDeclaredSubtypes()
+     * NodeType.getDeclaredSubtypes()} method.
      *
      * @return RemoteIterator
      * @throws RemoteException on RMI errors
      */
-	RemoteIterator getDeclaredSubtypes() throws RemoteException;
+    RemoteIterator getDeclaredSubtypes() throws RemoteException;
 
     /**
      * Remote version of the
@@ -285,6 +287,6 @@
      * @return RemoteIterator
      * @throws RemoteException on RMI errors
      */
-	RemoteIterator getSubtypes() throws RemoteException;
+    RemoteIterator getSubtypes() throws RemoteException;
 
 }
Index: src/main/java/org/apache/jackrabbit/rmi/remote/RemoteList.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/RemoteList.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/RemoteList.java	(revision 0)
@@ -0,0 +1,31 @@
+package org.apache.jackrabbit.rmi.remote;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.Collection;
+import java.util.List;
+
+public interface RemoteList<T extends Remote> extends Remote {
+
+    boolean add(T e) throws RemoteException;
+
+    boolean remove(T o) throws RemoteException;
+
+    boolean addAll(Collection<T> c) throws RemoteException;
+
+    boolean addAll(int index, Collection<T> c) throws RemoteException;
+
+    boolean removeAll(Collection<T> c) throws RemoteException;
+
+    boolean retainAll(Collection<T> c) throws RemoteException;
+
+    void clear() throws RemoteException;
+
+    T set(int index, T element) throws RemoteException;
+
+    void add(int index, T element) throws RemoteException;
+
+    T remove(int index) throws RemoteException;
+
+    List<T> getRemoteElements() throws RemoteException;
+}
Index: src/main/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinitionTemplate.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinitionTemplate.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinitionTemplate.java	(revision 0)
@@ -0,0 +1,184 @@
+package org.apache.jackrabbit.rmi.remote;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+/**
+ * Remote version of the JCR
+ * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+ * PropertyDefinitionTemplate} interface. Used by the
+ * {@link org.apache.jackrabbit.rmi.server.ServerPropertyDefinitionTemplate
+ * ServerPropertyDefinitionTemplate} and
+ * {@link org.apache.jackrabbit.rmi.client.ClientPropertyDefinitionTemplate
+ * ClientPropertyDefinitionTemplate} adapters to provide transparent RMI access
+ * to remote property definition templates.
+ * <p>
+ * The methods in this interface are documented only with a reference to a
+ * corresponding PropertyDefinitionTemplate method. The remote object will
+ * simply forward the method call to the underlying PropertyDefinitionTemplate
+ * instance. Arguments and possible exceptions are copied over the network.
+ * Complex {@link javax.jcr.nodetype.NodeType NodeType} values are returned as
+ * remote references to the
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeType RemoteNodeType}
+ * interface. Iterator values are transmitted as object arrays. RMI errors are
+ * signaled with RemoteExceptions.
+ *
+ * @see javax.jcr.nodetype.PropertyDefinitionTemplate
+ * @see org.apache.jackrabbit.rmi.client.ClientPropertyDefinitionTemplate
+ * @see org.apache.jackrabbit.rmi.server.ServerPropertyDefinitionTemplate
+ */
+public interface RemotePropertyDefinitionTemplate extends
+        RemotePropertyDefinition {
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setName(String)
+     * PropertyDefinitionTemplate.setName(String)}
+     * method.
+     *
+     * @param name a JCR name.
+     * @throws RemoteException on RMI errors
+     * @throws RepositoryException on repository errors
+     */
+    void setName(String name) throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setAutoCreated(boolean)
+     * PropertyDefinitionTemplate.setAutoCreated(boolean)}
+     * method.
+     *
+     * @param autoCreated a <code>boolean</code>.
+     * @throws RemoteException on RMI errors
+     */
+    void setAutoCreated(boolean autoCreated) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setMandatory(boolean)
+     * PropertyDefinitionTemplate.setMandatory(boolean)}
+     * method.
+     *
+     * @param mandatory a <code>boolean</code>.
+     * @throws RemoteException on RMI errors
+     */
+    void setMandatory(boolean mandatory) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setOnParentVersion(int)
+     * PropertyDefinitionTemplate.setOnParentVersion(int)}
+     * method.
+     *
+     * @param opv an <code>int</code> constant member of
+     *        <code>OnParentVersionAction</code>.
+     * @throws RemoteException on RMI errors
+     */
+    void setOnParentVersion(int opv) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setProtected(boolean)
+     * PropertyDefinitionTemplate.setProtected(boolean)}
+     * method.
+     *
+     * @param protectedStatus a <code>boolean</code>.
+     * @throws RemoteException on RMI errors
+     */
+    void setProtected(boolean protectedStatus) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setRequiredType(int)
+     * PropertyDefinitionTemplate.setRequiredType(int)}
+     * method.
+     *
+     * @param type an <code>int</code> constant member of
+     *        <code>PropertyType</code>.
+     * @throws RemoteException on RMI errors
+     */
+    void setRequiredType(int type) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setRequiredType(int)
+     * PropertyDefinitionTemplate.setRequiredType(int)}
+     * method.
+     *
+     * @param constraints a <code>String</code> array.
+     * @throws RemoteException on RMI errors
+     */
+    void setValueConstraints(String[] constraints) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setDefaultValues(Value[])
+     * PropertyDefinitionTemplate.setDefaultValues(Value[])}
+     * method.
+     *
+     * @param defaultValues a <code>Value</code> array.
+     * @throws RemoteException on RMI errors
+     */
+    void setDefaultValues(Value[] defaultValues) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setMultiple(boolean)
+     * PropertyDefinitionTemplate.setMultiple(boolean)}
+     * method.
+     *
+     * @param multiple a <code>boolean</code>.
+     * @throws RemoteException on RMI errors
+     */
+    void setMultiple(boolean multiple) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setAvailableQueryOperators(String[])
+     * PropertyDefinitionTemplate.setAvailableQueryOperators(String[])}
+     * method.
+     *
+     * @param operators an array of String constants. See
+     *        {@link PropertyDefinition#getAvailableQueryOperators()} .
+     * @throws RemoteException on RMI errors
+     */
+    void setAvailableQueryOperators(String[] operators) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setFullTextSearchable(boolean)
+     * PropertyDefinitionTemplate.setFullTextSearchable(boolean)}
+     * method.
+     *
+     * @param fullTextSearchable a <code>boolean</code>.
+     * @throws RemoteException on RMI errors
+     */
+    void setFullTextSearchable(boolean fullTextSearchable)
+            throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+     * #setQueryOrderable(boolean)
+     * PropertyDefinitionTemplate.setQueryOrderable(boolean)}
+     * method.
+     *
+     * @param queryOrderable a <code>boolean</code>.
+     * @throws RemoteException on RMI errors
+     */
+    void setQueryOrderable(boolean queryOrderable) throws RemoteException;
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeManager.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeManager.java	(working copy)
@@ -23,12 +23,12 @@
 
 /**
  * Remote version of the JCR
- * {@link javax.jcr.nodetype.NodeTypeManager NodeTypeManager} interface.
- * Used by the
- * {@link org.apache.jackrabbit.rmi.server.ServerNodeTypeManager ServerNodeTypeManager}
- * and
- * {@link org.apache.jackrabbit.rmi.client.ClientNodeTypeManager ClientNodeTypeManager}
- * adapters to provide transparent RMI access to remote node type managers.
+ * {@link javax.jcr.nodetype.NodeTypeManager NodeTypeManager} interface. Used
+ * by the {@link org.apache.jackrabbit.rmi.server.ServerNodeTypeManager
+ * ServerNodeTypeManager} and
+ * {@link org.apache.jackrabbit.rmi.client.ClientNodeTypeManager
+ * ClientNodeTypeManager} adapters to provide transparent RMI access to remote
+ * node type managers.
  * <p>
  * The methods in this interface are documented only with a reference
  * to a corresponding NodeTypeManager method. The remote object will
@@ -48,7 +48,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeTypeManager#getNodeType(String) NodeTypeManager.getNodeType(String)}
+     * {@link javax.jcr.nodetype.NodeTypeManager#getNodeType(String)
+     * NodeTypeManager.getNodeType(String)}
      * method.
      *
      * @param name node type name
@@ -61,7 +62,22 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeTypeManager#getAllNodeTypes() NodeTypeManager.getAllNodeTypes()}
+     * {@link javax.jcr.nodetype.NodeTypeManager#hasNodeType(String)
+     * NodeTypeManager.hasNodeType(String)}
+     * method.
+     *
+     * @param name node type name
+     * @return a boolean
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    boolean hasNodeType(String name)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeManager#getAllNodeTypes()
+     * NodeTypeManager.getAllNodeTypes()}
      * method.
      *
      * @return all node types
@@ -73,7 +89,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeTypeManager#getPrimaryNodeTypes() NodeTypeManager.getPrimaryNodeTypes()}
+     * {@link javax.jcr.nodetype.NodeTypeManager#getPrimaryNodeTypes()
+     * NodeTypeManager.getPrimaryNodeTypes()}
      * method.
      *
      * @return primary node types
@@ -85,7 +102,8 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.nodetype.NodeTypeManager#getMixinNodeTypes() NodeTypeManager.getMixinNodeTypes()}
+     * {@link javax.jcr.nodetype.NodeTypeManager#getMixinNodeTypes()
+     * NodeTypeManager.getMixinNodeTypes()}
      * method.
      *
      * @return mixin node types
@@ -95,9 +113,110 @@
     RemoteIterator getMixinNodeTypes()
             throws RepositoryException, RemoteException;
 
-    boolean hasNodeType(String name)
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeManager#createNodeTypeTemplate()
+     * NodeTypeManager.createNodeTypeTemplate()}
+     * method.
+     *
+     * @return node type template
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteNodeTypeTemplate createNodeTypeTemplate()
             throws RepositoryException, RemoteException;
 
+    /**
+     * Remote version of the {@link javax.jcr.nodetype.NodeTypeManager
+     * #createNodeTypeTemplate(NodeTypeDefinition)
+     * NodeTypeManager.createNodeTypeTemplate(NodeTypeDefinition)}
+     * method.
+     *
+     * @param rntd remote node type definition
+     * @return node type template
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteNodeTypeTemplate createNodeTypeTemplate(RemoteNodeTypeDefinition rntd)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeManager#createNodeDefinitionTemplate()
+     * NodeTypeManager.createNodeDefinitionTemplate()} method.
+     *
+     * @return node definition template
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteNodeDefinitionTemplate createNodeDefinitionTemplate()
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the {@link
+     * javax.jcr.nodetype.NodeTypeManager#createPropertyDefinitionTemplate()
+     * NodeTypeManager.createPropertyDefinitionTemplate()} method.
+     *
+     * @return property definition template
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemotePropertyDefinitionTemplate createPropertyDefinitionTemplate()
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the {@link javax.jcr.nodetype.NodeTypeManager
+     * #registerNodeType(NodeTypeDefinition, boolean)
+     * NodeTypeManager.registerNodeType(NodeTypeDefinition, boolean)} method.
+     *
+     * @param rntd remote node type definition
+     * @param allowUpdate a boolean
+     * @return the registered node type
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteNodeType registerNodeType(
+            RemoteNodeTypeDefinition rntd, boolean allowUpdate)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the {@link javax.jcr.nodetype.NodeTypeManager
+     * #registerNodeTypes(NodeTypeDefinition[], boolean)
+     * NodeTypeManager.registerNodeTypes(NodeTypeDefinition[], boolean)} method.
+     *
+     * @param rntds remote node type definitions
+     * @param allowUpdate a boolean
+     * @return registered node types
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteIterator registerNodeTypes(
+            RemoteNodeTypeDefinition[] rntds, boolean allowUpdate)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeManager#unregisterNodeType(String)
+     *  NodeTypeManager.unregisterNodeType(String)}
+     * method.
+     *
+     * @param name node type name
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    void unregisterNodeType(String name)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeTypeManager#unregisterNodeTypes(String[])
+     * NodeTypeManager.unregisterNodeTypes(String[])}
+     * method.
+     *
+     * @param names node type names
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
     void unregisterNodeTypes(String[] names)
             throws RepositoryException, RemoteException;
 
Index: src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinitionTemplate.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinitionTemplate.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinitionTemplate.java	(revision 0)
@@ -0,0 +1,118 @@
+package org.apache.jackrabbit.rmi.remote;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+
+/**
+ * Remote version of the JCR {@link javax.jcr.nodetype.NodeDefinitionTemplate
+ * NodeDefinitionTemplate} interface. Used by the
+ * {@link org.apache.jackrabbit.rmi.server.ServerNodeDefinitionTemplate
+ * ServerNodeDefinitionTemplate} and
+ * {@link org.apache.jackrabbit.rmi.client.ClientNodeDefinitionTemplate
+ * ClientNodeDefinitionTemplate} adapters to provide transparent RMI access to
+ * remote node definition templates.
+ * <p>
+ * The methods in this interface are documented only with a reference
+ * to a corresponding NodeDefinitionTemplate method. The remote object will
+ * simply forward the method call to the underlying NodeDefinitionTemplate
+ * instance.
+ * Arguments and possible exceptions are copied over the network. Complex
+ * {@link javax.jcr.nodetype.NodeType NodeType} values are returned as
+ * remote references to the
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeType RemoteNodeType}
+ * interface. Iterator values are transmitted as object arrays. RMI errors
+ * are signaled with RemoteExceptions.
+ *
+ * @see javax.jcr.nodetype.NodeDefinitionTemplate
+ * @see org.apache.jackrabbit.rmi.client.ClientNodeDefinitionTemplate
+ * @see org.apache.jackrabbit.rmi.server.ServerNodeDefinitionTemplate
+ */
+public interface RemoteNodeDefinitionTemplate extends RemoteNodeDefinition {
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeDefinitionTemplate#setName(String)
+     * NodeType.setName(String)} method.
+     *
+     * @param name a JCR name.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    void setName(String name) throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeDefinitionTemplate#setAutoCreated(boolean)
+     * NodeType.setAutoCreated(boolean)} method.
+     *
+     * @param autoCreated a boolean
+     * @throws RemoteException on RMI errors
+     */
+    void setAutoCreated(boolean autoCreated) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeDefinitionTemplate#setMandatory(boolean)
+     * NodeType.setMandatory(boolean)} method.
+     *
+     * @param mandatory a boolean
+     * @throws RemoteException on RMI errors
+     */
+    void setMandatory(boolean mandatory) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeDefinitionTemplate#setOnParentVersion(int)
+     * NodeType.setOnParentVersion(int)} method.
+     *
+     * @param opv an int
+     * @throws RemoteException on RMI errors
+     */
+    void setOnParentVersion(int opv) throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.nodetype.NodeDefinitionTemplate#setProtected(boolean)
+     * NodeType.setProtected(boolean)} method.
+     *
+     * @param protectedStatus a boolean
+     * @throws RemoteException on RMI errors
+     */
+    void setProtected(boolean protectedStatus) throws RemoteException;
+
+    /**
+     * Remote version of the {@link javax.jcr.nodetype.NodeDefinitionTemplate
+     * #setRequiredPrimaryTypeNames(String[])
+     * NodeType.setRequiredPrimaryTypeNames(String[])} method.
+     *
+     * @param names an array of JCR names
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    void setRequiredPrimaryTypeNames(String[] names)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the {@link javax.jcr.nodetype.NodeDefinitionTemplate
+     * #setDefaultPrimaryTypeName(String)
+     * NodeType.setDefaultPrimaryTypeName(String)} method.
+     *
+     * @param name a JCR name.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    void setDefaultPrimaryTypeName(String name) throws RepositoryException,
+            RemoteException;
+
+    /**
+     * Remote version of the {@link javax.jcr.nodetype.NodeDefinitionTemplate
+     * #setSameNameSiblings(boolean) NodeType.setSameNameSiblings(boolean)}
+     * method.
+     *
+     * @param allowSameNameSiblings a boolean
+     * @throws RemoteException on RMI errors
+     */
+    void setSameNameSiblings(boolean allowSameNameSiblings)
+            throws RemoteException;
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/remote/RemoteObservationManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/remote/RemoteObservationManager.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/remote/RemoteObservationManager.java	(working copy)
@@ -22,13 +22,13 @@
 import javax.jcr.RepositoryException;
 
 /**
- * Remote version of the JCR {@link javax.jcr.observation.ObservationManager ObservationManager}
- * interface. Used by the
- * {@link org.apache.jackrabbit.rmi.server.ServerObservationManager ServerObservationManager}
- * and
- * {@link org.apache.jackrabbit.rmi.client.ClientObservationManager ClientObservationManager}
- * adapter base classes to provide transparent RMI access to remote observation
- * managers.
+ * Remote version of the JCR {@link javax.jcr.observation.ObservationManager
+ * ObservationManager} interface. Used by the
+ * {@link org.apache.jackrabbit.rmi.server.ServerObservationManager
+ * ServerObservationManager} and
+ * {@link org.apache.jackrabbit.rmi.client.ClientObservationManager
+ * ClientObservationManager} adapter base classes to provide transparent RMI
+ * access to remote observation managers.
  * <p>
  * See the <a href="../observation/package.html><code>observation</code></a>
  * package comment for a description on how event listener registration and
@@ -42,7 +42,10 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.observation.ObservationManager#addEventListener(javax.jcr.observation.EventListener, int, String, boolean, String[], String[], boolean) ObservationManager.addEventListener()}
+     * {@link javax.jcr.observation.ObservationManager
+     * #addEventListener(javax.jcr.observation.EventListener, int, String,
+     * boolean, String[], String[], boolean)
+     * ObservationManager.addEventListener()}
      * method. See class comment for an explanation on how the
      * <code>listenerId</code> is used.
      *
@@ -71,7 +74,9 @@
 
     /**
      * Remote version of the
-     * {@link javax.jcr.observation.ObservationManager#removeEventListener(javax.jcr.observation.EventListener) ObservationManager.removeEventListener()}
+     * {@link javax.jcr.observation.ObservationManager
+     * #removeEventListener(javax.jcr.observation.EventListener)
+     * ObservationManager.removeEventListener()}
      * method. See class comment for an explanation on how the
      * <code>listenerId</code> is used.
      *
@@ -93,12 +98,58 @@
      *      available to be dispatched. If negative or zero, this method waits
      *      for ever.
      *
-     * @return The {@link RemoteEventCollection} to be dispatched. <code>null</code> is
-     *      returned if the method timed out waiting for an event to be
-     *      dispatched.
+     * @return The {@link RemoteEventCollection} to be dispatched.
+     *         <code>null</code> is returned if the method timed out waiting
+     *         for an event to be dispatched.
      *
      * @throws RemoteException on RMI errors
      */
     RemoteEventCollection getNextEvent(long timeout)
         throws RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.observation.ObservationManager.setUserData(String)
+     * ObservationManager.setUserData(String)} method.
+     *
+     * @param userData the user data to set
+     *
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    void setUserData(String userData)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the {@link
+     * javax.jcr.observation.ObservationManager.getEventJournal()
+     * ObservationManager.getEventJournal(String)} method.
+     *
+     * @return The {@link RemoteEventJournal} of the current workspace.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteEventJournal getEventJournal()
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the {@link
+     * javax.jcr.observation.ObservationManager.getEventJournal()
+     * ObservationManager.getEventJournal(String)} method.
+     *
+     * @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 identifiers.
+     * @param nodeTypeName array of node type names.
+     *
+     * @return The {@link RemoteEventJournal} of the current workspace.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteEventJournal getEventJournal(int eventTypes, String absPath,
+            boolean isDeep, String[] uuid, String[] nodeTypeName)
+            throws RepositoryException, RemoteException;
+
 }
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerObject.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerObject.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerObject.java	(working copy)
@@ -42,8 +42,10 @@
 import javax.jcr.ValueFormatException;
 import javax.jcr.lock.LockException;
 import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.InvalidNodeTypeDefinitionException;
 import javax.jcr.nodetype.NoSuchNodeTypeException;
 import javax.jcr.nodetype.NodeType;
+import javax.jcr.nodetype.NodeTypeExistsException;
 import javax.jcr.query.InvalidQueryException;
 import javax.jcr.security.AccessControlException;
 import javax.jcr.version.Version;
@@ -109,6 +111,8 @@
             return new ConstraintViolationException(ex.getMessage());
         } else if (ex instanceof InvalidItemStateException) {
             return new InvalidItemStateException(ex.getMessage());
+        } else if (ex instanceof InvalidNodeTypeDefinitionException) {
+            return new InvalidNodeTypeDefinitionException(ex.getMessage());
         } else if (ex instanceof InvalidQueryException) {
             return new InvalidQueryException(ex.getMessage());
         } else if (ex instanceof InvalidSerializedDataException) {
@@ -125,6 +129,8 @@
             return new MergeException(ex.getMessage());
         } else if (ex instanceof NamespaceException) {
             return new NamespaceException(ex.getMessage());
+        } else if (ex instanceof NodeTypeExistsException) {
+            return new NodeTypeExistsException(ex.getMessage());
         } else if (ex instanceof NoSuchNodeTypeException) {
             return new NoSuchNodeTypeException(ex.getMessage());
         } else if (ex instanceof NoSuchWorkspaceException) {
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeManager.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeManager.java	(working copy)
@@ -19,11 +19,16 @@
 import java.rmi.RemoteException;
 
 import javax.jcr.RepositoryException;
+import javax.jcr.nodetype.NodeTypeDefinition;
 import javax.jcr.nodetype.NodeTypeManager;
 
 import org.apache.jackrabbit.rmi.remote.RemoteIterator;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinitionTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeDefinition;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeTemplate;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate;
 
 /**
  * Remote adapter for the JCR
@@ -99,6 +104,7 @@
         }
     }
 
+    /** {@inheritDoc} */
     public boolean hasNodeType(String name)
             throws RepositoryException, RemoteException {
         try {
@@ -108,6 +114,7 @@
         }
     }
 
+    /** {@inheritDoc} */
     public void unregisterNodeTypes(String[] names)
             throws RepositoryException, RemoteException {
         try {
@@ -117,4 +124,89 @@
         }
     }
 
+    /** {@inheritDoc} */
+    public RemoteNodeTypeTemplate createNodeTypeTemplate()
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteNodeTypeTemplate(
+                    manager.createNodeTypeTemplate());
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteNodeTypeTemplate createNodeTypeTemplate(
+            RemoteNodeTypeDefinition rntd) throws RepositoryException,
+            RemoteException {
+        try {
+            NodeTypeDefinition ntd = (NodeTypeDefinition) getFactory()
+                    .getJcrObject(rntd);
+            return getFactory().getRemoteNodeTypeTemplate(
+                    manager.createNodeTypeTemplate(ntd));
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteNodeDefinitionTemplate createNodeDefinitionTemplate()
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteNodeDefinitionTemplate(
+                    manager.createNodeDefinitionTemplate());
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemotePropertyDefinitionTemplate createPropertyDefinitionTemplate()
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemotePropertyDefinitionTemplate(
+                    manager.createPropertyDefinitionTemplate());
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+    /** {@inheritDoc} */
+    public RemoteNodeType registerNodeType(RemoteNodeTypeDefinition rntd,
+            boolean allowUpdate) throws RepositoryException, RemoteException {
+        try {
+            NodeTypeDefinition ntd = (NodeTypeDefinition) getFactory()
+                    .getJcrObject(rntd);
+            return getFactory().getRemoteNodeType(
+                    manager.registerNodeType(ntd, allowUpdate));
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteIterator registerNodeTypes(RemoteNodeTypeDefinition[] rntds,
+            boolean allowUpdate) throws RepositoryException, RemoteException {
+        try {
+            NodeTypeDefinition[] ntds = new NodeTypeDefinition[rntds.length];
+            for (int i = 0; i < rntds.length; i++) {
+                ntds[i] = (NodeTypeDefinition) getFactory().getJcrObject(
+                        rntds[i]);
+            }
+            return getFactory().getRemoteNodeTypeIterator(
+                    manager.registerNodeTypes(ntds, allowUpdate));
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void unregisterNodeType(String name) throws RepositoryException,
+            RemoteException {
+        try {
+            manager.unregisterNodeType(name);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
 }
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java	(working copy)
@@ -67,7 +67,12 @@
     /** {@inheritDoc} */
     public Value[] getDefaultValues() throws RemoteException {
         try {
-            return getSerialValues(def.getDefaultValues());
+            Value[] defaultValues = def.getDefaultValues();
+            if (defaultValues == null) {
+                return null;
+            } else {
+                return getSerialValues(defaultValues);
+            }
         } catch (RepositoryException e) {
             throw new RemoteException("Unable to serialize default values");
         }
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerObservationManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerObservationManager.java	(revision 1377741)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerObservationManager.java	(working copy)
@@ -26,6 +26,7 @@
 import org.apache.jackrabbit.rmi.observation.Queue;
 import org.apache.jackrabbit.rmi.observation.ServerEventListenerProxy;
 import org.apache.jackrabbit.rmi.remote.RemoteEventCollection;
+import org.apache.jackrabbit.rmi.remote.RemoteEventJournal;
 import org.apache.jackrabbit.rmi.remote.RemoteObservationManager;
 
 /**
@@ -141,6 +142,37 @@
         return null;
     }
 
+    /** {@inheritDoc} */
+    public void setUserData(String userData) throws RepositoryException,
+            RemoteException {
+        try {
+            observationManager.setUserData(userData);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteEventJournal getEventJournal() throws RepositoryException,
+            RemoteException {
+        try {
+            return getFactory().getRemoteEventJournal(observationManager.getEventJournal());
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteEventJournal getEventJournal(int eventTypes, String absPath,
+            boolean isDeep, String[] uuid, String[] nodeTypeName)
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteEventJournal(observationManager.getEventJournal(eventTypes, absPath, isDeep, uuid, nodeTypeName));
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
     //---------- internal ------------------------------------------------------
 
     /**
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinitionTemplate.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinitionTemplate.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinitionTemplate.java	(revision 0)
@@ -0,0 +1,85 @@
+package org.apache.jackrabbit.rmi.server;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.nodetype.NodeDefinitionTemplate;
+
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinitionTemplate;
+
+public class ServerNodeDefinitionTemplate extends ServerNodeDefinition
+        implements RemoteNodeDefinitionTemplate {
+
+    /** The adapted node definition template. */
+    private NodeDefinitionTemplate deft;
+
+    /**
+     * Creates a remote adapter for the given local node definition template.
+     * 
+     * @param deft local node definition template
+     * @param factory remote adapter factory
+     * @throws RemoteException on RMI errors
+     */
+    public ServerNodeDefinitionTemplate(NodeDefinitionTemplate deft,
+            RemoteAdapterFactory factory) throws RemoteException {
+        super(deft, factory);
+        this.deft = deft;
+    }
+
+    /** {@inheritDoc} */
+    public void setName(String name) throws RepositoryException,
+            RemoteException {
+        try {
+            deft.setName(name);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void setAutoCreated(boolean autoCreated) throws RemoteException {
+        deft.setAutoCreated(autoCreated);
+    }
+
+    /** {@inheritDoc} */
+    public void setMandatory(boolean mandatory) throws RemoteException {
+        deft.setMandatory(mandatory);
+    }
+
+    /** {@inheritDoc} */
+    public void setOnParentVersion(int opv) throws RemoteException {
+        deft.setOnParentVersion(opv);
+    }
+
+    /** {@inheritDoc} */
+    public void setProtected(boolean protectedStatus) throws RemoteException {
+        deft.setProtected(protectedStatus);
+    }
+
+    /** {@inheritDoc} */
+    public void setRequiredPrimaryTypeNames(String[] names)
+            throws RepositoryException, RemoteException {
+        try {
+            deft.setRequiredPrimaryTypeNames(names);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void setDefaultPrimaryTypeName(String name)
+            throws RepositoryException, RemoteException {
+        try {
+            deft.setDefaultPrimaryTypeName(name);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void setSameNameSiblings(boolean allowSameNameSiblings)
+            throws RemoteException {
+        deft.setSameNameSiblings(allowSameNameSiblings);
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java	(revision 1377741)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java	(working copy)
@@ -20,7 +20,6 @@
 import java.security.Principal;
 import java.security.acl.Group;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.jcr.Item;
@@ -36,12 +35,16 @@
 import javax.jcr.lock.LockManager;
 import javax.jcr.nodetype.ItemDefinition;
 import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeDefinitionTemplate;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.NodeTypeIterator;
 import javax.jcr.nodetype.NodeTypeManager;
+import javax.jcr.nodetype.NodeTypeTemplate;
 import javax.jcr.nodetype.PropertyDefinition;
+import javax.jcr.nodetype.PropertyDefinitionTemplate;
 import javax.jcr.observation.Event;
 import javax.jcr.observation.EventIterator;
+import javax.jcr.observation.EventJournal;
 import javax.jcr.observation.ObservationManager;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
@@ -60,9 +63,15 @@
 import javax.jcr.version.VersionManager;
 import javax.transaction.xa.XAResource;
 
+import org.apache.commons.collections.map.ReferenceIdentityMap;
+import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.jackrabbit.rmi.client.SerializableEvent;
+import org.apache.jackrabbit.rmi.client.SerializableGroup;
+import org.apache.jackrabbit.rmi.client.SerializablePrincipal;
 import org.apache.jackrabbit.rmi.remote.ArrayIterator;
 import org.apache.jackrabbit.rmi.remote.BufferIterator;
 import org.apache.jackrabbit.rmi.remote.RemoteEventCollection;
+import org.apache.jackrabbit.rmi.remote.RemoteEventJournal;
 import org.apache.jackrabbit.rmi.remote.RemoteItem;
 import org.apache.jackrabbit.rmi.remote.RemoteItemDefinition;
 import org.apache.jackrabbit.rmi.remote.RemoteIterator;
@@ -71,11 +80,14 @@
 import org.apache.jackrabbit.rmi.remote.RemoteNamespaceRegistry;
 import org.apache.jackrabbit.rmi.remote.RemoteNode;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinitionTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteObservationManager;
 import org.apache.jackrabbit.rmi.remote.RemoteProperty;
 import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteQuery;
 import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
 import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
@@ -86,7 +98,6 @@
 import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
 import org.apache.jackrabbit.rmi.remote.RemoteVersionManager;
 import org.apache.jackrabbit.rmi.remote.RemoteWorkspace;
-import org.apache.jackrabbit.rmi.remote.principal.RemotePrincipal;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlEntry;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlManager;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlPolicy;
@@ -96,9 +107,6 @@
 import org.apache.jackrabbit.rmi.server.iterator.ServerPropertyIterator;
 import org.apache.jackrabbit.rmi.server.iterator.ServerRowIterator;
 import org.apache.jackrabbit.rmi.server.iterator.ServerVersionIterator;
-import org.apache.jackrabbit.rmi.server.principal.ServerGroup;
-import org.apache.jackrabbit.rmi.server.principal.ServerPrincipal;
-import org.apache.jackrabbit.rmi.server.principal.ServerPrincipalIterator;
 import org.apache.jackrabbit.rmi.server.security.ServerAccessControlEntry;
 import org.apache.jackrabbit.rmi.server.security.ServerAccessControlList;
 import org.apache.jackrabbit.rmi.server.security.ServerAccessControlManager;
@@ -124,6 +132,14 @@
     /** The buffer size of iterators created by this factory. */
     private int bufferSize = DEFAULT_BUFFER_SIZE;
 
+    /** A cache mapping local JCR Objects to Remote Stubs. */
+    private ReferenceIdentityMap remoteCache =
+            new ReferenceIdentityMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
+
+    /** A cache mapping Remote Stubs to local JCR Objects. */
+    private ReferenceMap localCache =
+            new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
+
     /**
      * The port number for server objects. Initializes to the value of the
      * <code>org.apache.jackrabbit.rmi.port</code> system property, or to 0 if
@@ -175,7 +191,13 @@
      */
     public RemoteRepository getRemoteRepository(Repository repository)
             throws RemoteException {
-        return new ServerRepository(repository, this);
+        ServerRepository remote =
+                (ServerRepository) getRemoteObject(repository);
+        if (remote == null) {
+            remote = new ServerRepository(repository, this);
+            addToCache(repository, remote);
+        }
+        return remote;
     }
 
     /**
@@ -186,11 +208,17 @@
      */
     public RemoteSession getRemoteSession(Session session)
             throws RemoteException {
-        if (session instanceof XAResource) {
-            return new ServerXASession(session, (XAResource) session, this);
-        } else {
-            return new ServerSession(session, this);
+        ServerSession remote = (ServerSession) getRemoteObject(session);
+        if (remote == null) {
+            if (session instanceof XAResource) {
+                remote = new ServerXASession(session, (XAResource) session,
+                        this);
+            } else {
+                remote = new ServerSession(session, this);
+            }
+            addToCache(session, remote);
         }
+        return remote;
     }
 
     /**
@@ -198,7 +226,12 @@
      */
     public RemoteWorkspace getRemoteWorkspace(Workspace workspace)
             throws RemoteException {
-        return new ServerWorkspace(workspace, this);
+        ServerWorkspace remote = (ServerWorkspace) getRemoteObject(workspace);
+        if (remote == null) {
+            remote = new ServerWorkspace(workspace, this);
+            addToCache(workspace, remote);
+        }
+        return remote;
     }
 
     /**
@@ -207,7 +240,13 @@
      */
     public RemoteObservationManager getRemoteObservationManager(
             ObservationManager observationManager) throws RemoteException {
-        return new ServerObservationManager(observationManager, this);
+        ServerObservationManager remote =
+                (ServerObservationManager) getRemoteObject(observationManager);
+        if (remote == null) {
+            remote = new ServerObservationManager(observationManager, this);
+            addToCache(observationManager, remote);
+        }
+        return remote;
     }
 
     /**
@@ -216,7 +255,13 @@
      */
     public RemoteNamespaceRegistry getRemoteNamespaceRegistry(
             NamespaceRegistry registry) throws RemoteException {
-        return new ServerNamespaceRegistry(registry, this);
+        ServerNamespaceRegistry remote =
+                (ServerNamespaceRegistry) getRemoteObject(registry);
+        if (remote == null) {
+            remote = new ServerNamespaceRegistry(registry, this);
+            addToCache(registry, remote);
+        }
+        return remote;
     }
 
     /**
@@ -225,14 +270,25 @@
      */
     public RemoteNodeTypeManager getRemoteNodeTypeManager(
             NodeTypeManager manager) throws RemoteException {
-        return new ServerNodeTypeManager(manager, this);
+        ServerNodeTypeManager remote =
+                (ServerNodeTypeManager) getRemoteObject(manager);
+        if (remote == null) {
+            remote = new ServerNodeTypeManager(manager, this);
+            addToCache(manager, remote);
+        }
+        return remote;
     }
 
     /**
      * Creates a {@link ServerItem ServerItem} instance. {@inheritDoc}
      */
     public RemoteItem getRemoteItem(Item item) throws RemoteException {
-        return new ServerItem(item, this);
+        ServerItem remote = (ServerItem) getRemoteObject(item);
+        if (remote == null) {
+            remote = new ServerItem(item, this);
+            addToCache(item, remote);
+        }
+        return remote;
     }
 
     /**
@@ -240,14 +296,24 @@
      */
     public RemoteProperty getRemoteProperty(Property property)
             throws RemoteException {
-        return new ServerProperty(property, this);
+        ServerProperty remote = (ServerProperty) getRemoteObject(property);
+        if (remote == null) {
+            remote = new ServerProperty(property, this);
+            addToCache(property, remote);
+        }
+        return remote;
     }
 
     /**
      * Creates a {@link ServerNode ServerNode} instance. {@inheritDoc}
      */
     public RemoteNode getRemoteNode(Node node) throws RemoteException {
-        return new ServerNode(node, this);
+        ServerNode remote = (ServerNode) getRemoteObject(node);
+        if (remote == null) {
+            remote = new ServerNode(node, this);
+            addToCache(node, remote);
+        }
+        return remote;
     }
 
     /**
@@ -255,7 +321,12 @@
      */
     public RemoteVersion getRemoteVersion(Version version)
             throws RemoteException {
-        return new ServerVersion(version, this);
+        ServerVersion remote = (ServerVersion) getRemoteObject(version);
+        if (remote == null) {
+            remote = new ServerVersion(version, this);
+            addToCache(version, remote);
+        }
+        return remote;
     }
 
     /**
@@ -264,7 +335,13 @@
      */
     public RemoteVersionHistory getRemoteVersionHistory(
             VersionHistory versionHistory) throws RemoteException {
-        return new ServerVersionHistory(versionHistory, this);
+        ServerVersionHistory remote =
+                (ServerVersionHistory) getRemoteObject(versionHistory);
+        if (remote == null) {
+            remote = new ServerVersionHistory(versionHistory, this);
+            addToCache(versionHistory, remote);
+        }
+        return remote;
     }
 
     /**
@@ -272,7 +349,12 @@
      */
     public RemoteNodeType getRemoteNodeType(NodeType type)
             throws RemoteException {
-        return new ServerNodeType(type, this);
+        ServerNodeType remote = (ServerNodeType) getRemoteObject(type);
+        if (remote == null) {
+            remote = new ServerNodeType(type, this);
+            addToCache(type, remote);
+        }
+        return remote;
     }
 
     /**
@@ -281,7 +363,13 @@
      */
     public RemoteItemDefinition getRemoteItemDefinition(ItemDefinition def)
             throws RemoteException {
-        return new ServerItemDefinition(def, this);
+        ServerItemDefinition remote =
+                (ServerItemDefinition) getRemoteObject(def);
+        if (remote == null) {
+            remote = new ServerItemDefinition(def, this);
+            addToCache(def, remote);
+        }
+        return remote;
     }
 
     /**
@@ -290,7 +378,13 @@
      */
     public RemoteNodeDefinition getRemoteNodeDefinition(NodeDefinition def)
             throws RemoteException {
-        return new ServerNodeDefinition(def, this);
+        ServerNodeDefinition remote =
+                (ServerNodeDefinition) getRemoteObject(def);
+        if (remote == null) {
+            remote = new ServerNodeDefinition(def, this);
+            addToCache(def, remote);
+        }
+        return remote;
     }
 
     /**
@@ -299,14 +393,25 @@
      */
     public RemotePropertyDefinition getRemotePropertyDefinition(
             PropertyDefinition def) throws RemoteException {
-        return new ServerPropertyDefinition(def, this);
+        ServerPropertyDefinition remote =
+                (ServerPropertyDefinition) getRemoteObject(def);
+        if (remote == null) {
+            remote = new ServerPropertyDefinition(def, this);
+            addToCache(def, remote);
+        }
+        return remote;
     }
 
     /**
      * Creates a {@link ServerLock ServerLock} instance. {@inheritDoc}
      */
     public RemoteLock getRemoteLock(Lock lock) throws RemoteException {
-        return new ServerLock(lock, this);
+        ServerLock remote = (ServerLock) getRemoteObject(lock);
+        if (remote == null) {
+            remote = new ServerLock(lock, this);
+            addToCache(lock, remote);
+        }
+        return remote;
     }
 
     /**
@@ -315,14 +420,25 @@
      */
     public RemoteQueryManager getRemoteQueryManager(Session session,
             QueryManager manager) throws RemoteException {
-        return new ServerQueryManager(session, manager, this);
+        ServerQueryManager remote =
+                (ServerQueryManager) getRemoteObject(manager);
+        if (remote == null) {
+            remote = new ServerQueryManager(session, manager, this);
+            addToCache(manager, remote);
+        }
+        return remote;
     }
 
     /**
      * Creates a {@link ServerQuery ServerQuery} instance. {@inheritDoc}
      */
     public RemoteQuery getRemoteQuery(Query query) throws RemoteException {
-        return new ServerQuery(query, this);
+        ServerQuery remote = (ServerQuery) getRemoteObject(query);
+        if (remote == null) {
+            remote = new ServerQuery(query, this);
+            addToCache(query, remote);
+        }
+        return remote;
     }
 
     /**
@@ -331,7 +447,12 @@
      */
     public RemoteQueryResult getRemoteQueryResult(QueryResult result)
             throws RemoteException {
-        return new ServerQueryResult(result, this);
+        ServerQueryResult remote = (ServerQueryResult) getRemoteObject(result);
+        if (remote == null) {
+            remote = new ServerQueryResult(result, this);
+            addToCache(result, remote);
+        }
+        return remote;
     }
 
     /**
@@ -339,7 +460,12 @@
      * {@inheritDoc}
      */
     public RemoteRow getRemoteRow(Row row) throws RemoteException {
-        return new ServerRow(row, this);
+        ServerRow remote = (ServerRow) getRemoteObject(row);
+        if (remote == null) {
+            remote = new ServerRow(row, this);
+            addToCache(row, remote);
+        }
+        return remote;
     }
 
     /**
@@ -348,21 +474,20 @@
      */
     public RemoteEventCollection getRemoteEvent(long listenerId,
             EventIterator events) throws RemoteException {
-        RemoteEventCollection.RemoteEvent[] remoteEvents;
+        SerializableEvent[] serEvents;
         if (events != null) {
-			List<ServerEventCollection.ServerEvent> eventList = new ArrayList<ServerEventCollection.ServerEvent>();
-			while (events.hasNext()) {
-				Event event = events.nextEvent();
-				eventList
-						.add(new ServerEventCollection.ServerEvent(event, this));
-			}
-            remoteEvents = eventList.toArray(new RemoteEventCollection.RemoteEvent[eventList.size()]);
+            List<SerializableEvent> eventList =
+                    new ArrayList<SerializableEvent>();
+            while (events.hasNext()) {
+                Event event = events.nextEvent();
+                eventList.add(new SerializableEvent(event));
+            }
+            serEvents =
+                    eventList.toArray(new SerializableEvent[eventList.size()]);
         } else {
-            remoteEvents = new RemoteEventCollection.RemoteEvent[0]; // for
-            // safety
+            serEvents = new SerializableEvent[0]; // for safety
         }
-
-        return new ServerEventCollection(listenerId, remoteEvents, this);
+        return new ServerEventCollection(listenerId, serEvents, this);
     }
 
     /**
@@ -439,14 +564,28 @@
             bufferSize));
     }
 
+    /** {@inheritDoc} */
     public RemoteLockManager getRemoteLockManager(LockManager lockManager)
             throws RemoteException {
-        return new ServerLockManager(lockManager, this);
+        ServerLockManager remote =
+                (ServerLockManager) getRemoteObject(lockManager);
+        if (remote == null) {
+            remote = new ServerLockManager(lockManager, this);
+            addToCache(lockManager, remote);
+        }
+        return remote;
     }
 
+    /** {@inheritDoc} */
     public RemoteVersionManager getRemoteVersionManager(Session session,
             VersionManager versionManager) throws RemoteException {
-        return new ServerVersionManager(session, versionManager, this);
+        ServerVersionManager remote =
+                (ServerVersionManager) getRemoteObject(versionManager);
+        if (remote == null) {
+            remote = new ServerVersionManager(session, versionManager, this);
+            addToCache(versionManager, remote);
+        }
+        return remote;
     }
 
     /**
@@ -456,14 +595,26 @@
      */
     public RemoteAccessControlManager getRemoteAccessControlManager(
             AccessControlManager acm) throws RemoteException {
-        return new ServerAccessControlManager(acm, this);
+        ServerAccessControlManager remote = (ServerAccessControlManager) getRemoteObject(acm);
+        if (remote == null) {
+            remote = new ServerAccessControlManager(acm, this);
+            addToCache(acm, remote);
+        }
+        return remote;
     }
 
+    /** {@inheritDoc} */
     public RemotePrivilege getRemotePrivilege(final Privilege local)
             throws RemoteException {
-        return new ServerPrivilege(local, this);
+        ServerPrivilege remote = (ServerPrivilege) getRemoteObject(local);
+        if (remote == null) {
+            remote = new ServerPrivilege(local, this);
+            addToCache(local, remote);
+        }
+        return remote;
     }
 
+    /** {@inheritDoc} */
     public RemotePrivilege[] getRemotePrivilege(final Privilege[] local)
             throws RemoteException {
         RemotePrivilege[] remote = new RemotePrivilege[local.length];
@@ -473,17 +624,28 @@
         return remote;
     }
 
+    /** {@inheritDoc} */
     public RemoteAccessControlPolicy getRemoteAccessControlPolicy(
             final AccessControlPolicy local) throws RemoteException {
-        if (local instanceof AccessControlList) {
-            return new ServerAccessControlList((AccessControlList) local, this);
+        ServerAccessControlPolicy remote =
+                (ServerAccessControlPolicy) getRemoteObject(local);
+        if (remote == null) {
+            if (local instanceof AccessControlList) {
+                remote = new ServerAccessControlList(
+                        (AccessControlList) local, this);
+            } else {
+                remote = new ServerAccessControlPolicy(local, this);
+            }
+            addToCache(local, remote);
         }
-        return new ServerAccessControlPolicy(local, this);
+        return remote;
     }
 
+    /** {@inheritDoc} */
     public RemoteAccessControlPolicy[] getRemoteAccessControlPolicy(
             final AccessControlPolicy[] local) throws RemoteException {
-        RemoteAccessControlPolicy[] remote = new RemoteAccessControlPolicy[local.length];
+        RemoteAccessControlPolicy[] remote =
+                new RemoteAccessControlPolicy[local.length];
         for (int i = 0; i < remote.length; i++) {
             remote[i] = getRemoteAccessControlPolicy(local[i]);
         }
@@ -499,32 +661,102 @@
             this, bufferSize));
     }
 
+    /** {@inheritDoc} */
     public RemoteAccessControlEntry getRemoteAccessControlEntry(
             final AccessControlEntry local) throws RemoteException {
-        return new ServerAccessControlEntry(local, this);
+        ServerAccessControlEntry remote =
+                (ServerAccessControlEntry) getRemoteObject(local);
+        if (remote == null) {
+            remote = new ServerAccessControlEntry(local, this);
+            addToCache(local, remote);
+        }
+        return remote;
     }
 
+    /** {@inheritDoc} */
     public RemoteAccessControlEntry[] getRemoteAccessControlEntry(
             final AccessControlEntry[] local) throws RemoteException {
-        RemoteAccessControlEntry[] remote = new RemoteAccessControlEntry[local.length];
+        RemoteAccessControlEntry[] remote =
+                new RemoteAccessControlEntry[local.length];
         for (int i = 0; i < remote.length; i++) {
             remote[i] = getRemoteAccessControlEntry(local[i]);
         }
         return remote;
     }
 
-    public RemotePrincipal getRemotePrincipal(final Principal principal) throws RemoteException {
-        if (principal instanceof Group) {
-            return new ServerGroup((Group) principal, this);
+    /** {@inheritDoc} */
+    public SerializablePrincipal getPrincipal(final Principal p)
+            throws RemoteException {
+        if (p instanceof SerializablePrincipal) {
+            return (SerializablePrincipal) p;
+        } else if (p instanceof Group) {
+            return new SerializableGroup((Group) p);
+        }
+        return new SerializablePrincipal(p);
+    }
+
+    /** {@inheritDoc} */
+    public RemoteNodeDefinitionTemplate getRemoteNodeDefinitionTemplate(
+            NodeDefinitionTemplate ndt) throws RemoteException {
+        ServerNodeDefinitionTemplate remote =
+                (ServerNodeDefinitionTemplate) getRemoteObject(ndt);
+        if (remote == null) {
+            remote = new ServerNodeDefinitionTemplate(ndt, this);
+            addToCache(ndt, remote);
+        }
+        return remote;
+    }
+
+    /** {@inheritDoc} */
+    public RemotePropertyDefinitionTemplate getRemotePropertyDefinitionTemplate(
+            PropertyDefinitionTemplate pdt) throws RemoteException {
+        ServerPropertyDefinitionTemplate remote =
+                (ServerPropertyDefinitionTemplate) getRemoteObject(pdt);
+        if (remote == null) {
+            remote = new ServerPropertyDefinitionTemplate(pdt, this);
+            addToCache(pdt, remote);
         }
+        return remote;
+    }
 
-        return new ServerPrincipal(principal, this);
+    /** {@inheritDoc} */
+    public RemoteNodeTypeTemplate getRemoteNodeTypeTemplate(NodeTypeTemplate ntt)
+            throws RemoteException {
+        ServerNodeTypeTemplate remote =
+                (ServerNodeTypeTemplate) getRemoteObject(ntt);
+        if (remote == null) {
+            remote = new ServerNodeTypeTemplate(ntt, this);
+            addToCache(ntt, remote);
+        }
+        return remote;
     }
 
-    public RemoteIterator getRemotePrincipalIterator(
-            Iterator<Principal> principals) throws RemoteException {
-        return optimizeIterator(new ServerPrincipalIterator(principals, this,
-            bufferSize));
+    /** {@inheritDoc} */
+    public Object getJcrObject(Object netObject) {
+        return localCache.get(netObject);
+    }
+
+    /** {@inheritDoc} */
+    public Object getRemoteObject(Object jcrObject) {
+        return remoteCache.get(jcrObject);
+    }
+
+    /** {@inheritDoc} */
+    private void addToCache(Object jcrObject, Object netObject) {
+        remoteCache.put(jcrObject, netObject);
+        localCache.put(netObject, jcrObject);
+    }
+
+    /** {@inheritDoc} */
+    public RemoteEventJournal getRemoteEventJournal(EventJournal journal)
+            throws RemoteException {
+        ServerEventJournal remote =
+                (ServerEventJournal) getRemoteObject(journal);
+        if (remote == null) {
+            remote = new ServerEventJournal(journal, this, bufferSize);
+            addToCache(journal, remote);
+        }
+        return remote;
     }
 
 }
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java	(working copy)
@@ -54,7 +54,12 @@
 
     /** {@inheritDoc} */
     public RemoteNodeType[] getRequiredPrimaryTypes() throws RemoteException {
-        return getRemoteNodeTypeArray(def.getRequiredPrimaryTypes());
+        NodeType[] rpt = def.getRequiredPrimaryTypes();
+        if (rpt == null) {
+            return null;
+        } else {
+            return getRemoteNodeTypeArray(rpt);
+        }
     }
 
     /** {@inheritDoc} */
@@ -73,13 +78,23 @@
     }
 
     /** {@inheritDoc} */
-	public String getDefaultPrimaryTypeName() throws RemoteException {
-        return def.getDefaultPrimaryTypeName();
-	}
+    public String getDefaultPrimaryTypeName() throws RemoteException {
+        String dptn = def.getDefaultPrimaryTypeName();
+        if (dptn == null) {
+            return null;
+        } else {
+            return dptn;
+        }
+    }
 
     /** {@inheritDoc} */
-	public String[] getRequiredPrimaryTypeNames() throws RemoteException {
-        return def.getRequiredPrimaryTypeNames();
-	}
+    public String[] getRequiredPrimaryTypeNames() throws RemoteException {
+        String[] rptn = def.getRequiredPrimaryTypeNames();
+        if (rptn == null) {
+            return null;
+        } else {
+            return rptn;
+        }
+    }
 
 }
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerEventCollection.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerEventCollection.java	(revision 1377741)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerEventCollection.java	(working copy)
@@ -17,11 +17,8 @@
 package org.apache.jackrabbit.rmi.server;
 
 import java.rmi.RemoteException;
-import java.util.Map;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.observation.Event;
 
+import org.apache.jackrabbit.rmi.client.SerializableEvent;
 import org.apache.jackrabbit.rmi.remote.RemoteEventCollection;
 
 /**
@@ -44,7 +41,7 @@
      * The list of
      * {@link org.apache.jackrabbit.rmi.remote.RemoteEventCollection.RemoteEvent}.
      */
-    private final RemoteEvent[] events;
+    private final SerializableEvent[] events;
 
     /**
      * Creates an instance of this class.
@@ -56,7 +53,7 @@
      * @throws RemoteException on RMI errors
      */
     ServerEventCollection(
-            long listenerId, RemoteEvent[] events, RemoteAdapterFactory factory)
+            long listenerId, SerializableEvent[] events, RemoteAdapterFactory factory)
             throws RemoteException {
         super(factory);
 
@@ -70,68 +67,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteEvent[] getEvents() {
+    public SerializableEvent[] getEvents() {
         return events;
     }
 
-    /**
-     * Server side implementation of the {@link RemoteEvent} interface.
-     *
-     * {@inheritDoc}
-     */
-    public static class ServerEvent extends ServerObject implements RemoteEvent {
-
-        /** The adapted local event. */
-        private Event event;
-
-        /**
-         * Creates an instance of this class.
-         * @param type The event type.
-         * @param path The absolute path to the underlying item.
-         * @param userId The userID of the originating session.
-         * @param factory remote adapter factory
-         * @throws RemoteException on RMI errors
-         */
-        ServerEvent(Event event, RemoteAdapterFactory factory)
-                throws RemoteException {
-            super(factory);
-            this.event = event;
-        }
-
-        /** {@inheritDoc} */
-        public String getPath() throws RepositoryException {
-            return event.getPath();
-        }
-
-        /** {@inheritDoc} */
-        public int getType() {
-            return event.getType();
-        }
-
-        /** {@inheritDoc} */
-        public String getUserID() {
-            return event.getUserID();
-        }
-
-        /** {@inheritDoc} */
-		public String getIdentifier() throws RepositoryException,
-				RemoteException {
-			return event.getIdentifier();
-		}
-
-        /** {@inheritDoc} */
-		public Map getInfo() throws RepositoryException, RemoteException {
-			return event.getInfo();
-		}
-
-        /** {@inheritDoc} */
-		public String getUserData() throws RepositoryException, RemoteException {
-			return event.getUserData();
-		}
-
-        /** {@inheritDoc} */
-		public long getDate() throws RepositoryException, RemoteException {
-			return event.getDate();
-		}
-    }
 }
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeTemplate.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeTemplate.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeTemplate.java	(revision 0)
@@ -0,0 +1,153 @@
+package org.apache.jackrabbit.rmi.server;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NodeDefinitionTemplate;
+import javax.jcr.nodetype.NodeTypeTemplate;
+import javax.jcr.nodetype.PropertyDefinitionTemplate;
+
+import org.apache.jackrabbit.rmi.remote.RemoteList;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinitionTemplate;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeTemplate;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate;
+
+public class ServerNodeTypeTemplate extends ServerNodeTypeDefinition implements
+        RemoteNodeTypeTemplate {
+
+    /** The adapted local node type definition. */
+    private NodeTypeTemplate ntt;
+
+    /**
+     * Creates a remote adapter for the given local node type definition.
+     * 
+     * @param ntt local node type definition
+     * @param factory remote adapter factory
+     * @throws RemoteException on RMI errors
+     */
+    protected ServerNodeTypeTemplate(NodeTypeTemplate ntt,
+            RemoteAdapterFactory factory) throws RemoteException {
+        super(ntt, factory);
+        this.ntt = ntt;
+    }
+
+    /** {@inheritDoc} */
+    public void setName(String name) throws ConstraintViolationException,
+            RemoteException {
+        try {
+            ntt.setName(name);
+        } catch (ConstraintViolationException ex) {
+            throw new ConstraintViolationException(ex.getMessage());
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void setDeclaredSuperTypeNames(String[] names)
+            throws ConstraintViolationException, RemoteException {
+        try {
+            ntt.setDeclaredSuperTypeNames(names);
+        } catch (ConstraintViolationException ex) {
+            throw new ConstraintViolationException(ex.getMessage());
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void setAbstract(boolean abstractStatus) throws RemoteException {
+        ntt.setAbstract(abstractStatus);
+    }
+
+    /** {@inheritDoc} */
+    public void setMixin(boolean mixin) throws RemoteException {
+        ntt.setMixin(mixin);
+    }
+
+    /** {@inheritDoc} */
+    public void setOrderableChildNodes(boolean orderable)
+            throws RemoteException {
+        ntt.setOrderableChildNodes(orderable);
+    }
+
+    /** {@inheritDoc} */
+    public void setPrimaryItemName(String name) throws ConstraintViolationException,
+            RemoteException {
+        try {
+            ntt.setPrimaryItemName(name);
+        } catch (ConstraintViolationException ex) {
+            throw new ConstraintViolationException(ex.getMessage());
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void setQueryable(boolean queryable) throws RemoteException {
+        ntt.setQueryable(queryable);
+    }
+
+    /** {@inheritDoc} */
+    public RemoteList<RemotePropertyDefinitionTemplate> getPropertyDefinitionTemplates() throws RemoteException {
+        @SuppressWarnings("unchecked")
+        List<PropertyDefinitionTemplate> list = ntt.getPropertyDefinitionTemplates();
+        List<Remote> remotes = getRemotePropertyDefTempArray(list);
+        return new ServerList(list, remotes, getFactory());
+    }
+
+    /** {@inheritDoc} */
+    public RemoteList<RemoteNodeDefinitionTemplate> getNodeDefinitionTemplates() throws RemoteException {
+        @SuppressWarnings("unchecked")
+        List<NodeDefinitionTemplate> list = ntt.getNodeDefinitionTemplates();
+        List<Remote> remotes = getRemoteNodeDefTempArray(list);
+        return new ServerList(list, remotes, getFactory());
+    }
+
+    /**
+     * Utility method for creating an array of remote references for
+     * local node definition templates. The remote references are created using the
+     * remote adapter factory.
+     * <p>
+     * A <code>null</code> input is treated as an empty array.
+     *
+     * @param defs local node definition template list
+     * @return remote node definition template array
+     * @throws RemoteException on RMI errors
+     */
+    private List<Remote> getRemoteNodeDefTempArray(List defs)
+            throws RemoteException {
+        if (defs != null) {
+            List<Remote> remotes = new ArrayList<Remote>(defs.size());
+            for (Object def : defs) {
+                remotes.add(getFactory().getRemoteNodeDefinitionTemplate((NodeDefinitionTemplate) def));
+            }
+            return remotes;
+        } else {
+            return Collections.emptyList(); // for safety
+        }
+    }
+
+    /**
+     * Utility method for creating an array of remote references for
+     * local property definitions. The remote references are created using the
+     * remote adapter factory.
+     * <p>
+     * A <code>null</code> input is treated as an empty array.
+     *
+     * @param defs local property definition array
+     * @return remote property definition array
+     * @throws RemoteException on RMI errors
+     */
+    protected List<Remote> getRemotePropertyDefTempArray(List defs)
+            throws RemoteException {
+        if (defs != null) {
+            List<Remote> remotes = new ArrayList<Remote>(defs.size());
+            for (Object def : defs) {
+                remotes.add(getFactory().getRemotePropertyDefinitionTemplate((PropertyDefinitionTemplate) def));
+            }
+            return remotes;
+        } else {
+            return Collections.emptyList(); // for safety
+        }
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java	(revision 1377741)
+++ src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java	(working copy)
@@ -18,7 +18,6 @@
 
 import java.rmi.RemoteException;
 import java.security.Principal;
-import java.util.Iterator;
 
 import javax.jcr.Item;
 import javax.jcr.NamespaceRegistry;
@@ -33,11 +32,15 @@
 import javax.jcr.lock.LockManager;
 import javax.jcr.nodetype.ItemDefinition;
 import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeDefinitionTemplate;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.NodeTypeIterator;
 import javax.jcr.nodetype.NodeTypeManager;
+import javax.jcr.nodetype.NodeTypeTemplate;
 import javax.jcr.nodetype.PropertyDefinition;
+import javax.jcr.nodetype.PropertyDefinitionTemplate;
 import javax.jcr.observation.EventIterator;
+import javax.jcr.observation.EventJournal;
 import javax.jcr.observation.ObservationManager;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
@@ -54,7 +57,9 @@
 import javax.jcr.version.VersionIterator;
 import javax.jcr.version.VersionManager;
 
+import org.apache.jackrabbit.rmi.client.SerializablePrincipal;
 import org.apache.jackrabbit.rmi.remote.RemoteEventCollection;
+import org.apache.jackrabbit.rmi.remote.RemoteEventJournal;
 import org.apache.jackrabbit.rmi.remote.RemoteItem;
 import org.apache.jackrabbit.rmi.remote.RemoteItemDefinition;
 import org.apache.jackrabbit.rmi.remote.RemoteIterator;
@@ -63,11 +68,14 @@
 import org.apache.jackrabbit.rmi.remote.RemoteNamespaceRegistry;
 import org.apache.jackrabbit.rmi.remote.RemoteNode;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinitionTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteObservationManager;
 import org.apache.jackrabbit.rmi.remote.RemoteProperty;
 import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteQuery;
 import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
 import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
@@ -78,7 +86,6 @@
 import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
 import org.apache.jackrabbit.rmi.remote.RemoteVersionManager;
 import org.apache.jackrabbit.rmi.remote.RemoteWorkspace;
-import org.apache.jackrabbit.rmi.remote.principal.RemotePrincipal;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlEntry;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlManager;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlPolicy;
@@ -235,17 +242,18 @@
     /**
      * Returns a remote adapter for the given local item definition.
      * This method will return an adapter that implements <i>only</i> the
-     * {@link ItemDefinition ItemDefinition} interface. The caller may want to introspect
-     * the local item definition to determine whether to use either the
-     * {@link #getRemoteNodeDefinition(NodeDefinition) getRemoteNodeDef} or the
-     * {@link #getRemotePropertyDefinition(PropertyDefinition) getRemotePropertyDef}
-     * method instead.
+     * {@link ItemDefinition ItemDefinition} interface. The caller may want to
+     * introspect the local item definition to determine whether to use either
+     * the {@link #getRemoteNodeDefinition(NodeDefinition) getRemoteNodeDef} or
+     * the {@link #getRemotePropertyDefinition(PropertyDefinition)
+     * getRemotePropertyDef} method instead.
      *
      * @param def local item definition
      * @return remote item definition adapter
      * @throws RemoteException on RMI errors
      */
-    RemoteItemDefinition getRemoteItemDefinition(ItemDefinition def) throws RemoteException;
+    RemoteItemDefinition getRemoteItemDefinition(ItemDefinition def)
+            throws RemoteException;
 
     /**
      * Returns a remote adapter for the given local node definition.
@@ -254,7 +262,8 @@
      * @return remote node definition adapter
      * @throws RemoteException on RMI errors
      */
-    RemoteNodeDefinition getRemoteNodeDefinition(NodeDefinition def) throws RemoteException;
+    RemoteNodeDefinition getRemoteNodeDefinition(NodeDefinition def)
+            throws RemoteException;
 
     /**
      * Returns a remote adapter for the given local property definition.
@@ -377,10 +386,26 @@
     RemoteIterator getRemoteRowIterator(RowIterator iterator)
         throws RemoteException;
 
+    /**
+     * Returns a remote adapter for the given local lock manager.
+     *
+     * @param lockManager local lock manager
+     * @return remote iterator adapter
+     * @throws RemoteException on RMI errors
+     */
     RemoteLockManager getRemoteLockManager(LockManager lockManager)
         throws RemoteException;
 
-    RemoteVersionManager getRemoteVersionManager(Session session, VersionManager versionManager)
+    /**
+     * Returns a remote adapter for the given local lock manager.
+     *
+     * @param session local session
+     * @param versionManager local version manager
+     * @return remote iterator adapter
+     * @throws RemoteException on RMI errors
+     */
+    RemoteVersionManager getRemoteVersionManager(
+            Session session, VersionManager versionManager)
         throws RemoteException;
 
     /**
@@ -396,91 +421,142 @@
     /**
      * Returns a remote adapter for the given local access control manager.
      *
-     * @param acm local access control manager
+     * @param local privilege
      * @return remote access control manager
      * @throws RemoteException on RMI errors
      */
-    public RemotePrivilege getRemotePrivilege(final Privilege local)
+    RemotePrivilege getRemotePrivilege(final Privilege local)
             throws RemoteException;
 
     /**
      * Returns a remote adapter for the given local access control manager.
      *
-     * @param acm local access control manager
+     * @param local local privileges array
      * @return remote access control manager
      * @throws RemoteException on RMI errors
      */
-    public RemotePrivilege[] getRemotePrivilege(final Privilege[] local)
+    RemotePrivilege[] getRemotePrivilege(final Privilege[] local)
             throws RemoteException;
 
     /**
      * Returns a remote adapter for the given local access control manager.
      *
-     * @param acm local access control manager
+     * @param local local access control policy
      * @return remote access control manager
      * @throws RemoteException on RMI errors
      */
-    public RemoteAccessControlPolicy getRemoteAccessControlPolicy(
+    RemoteAccessControlPolicy getRemoteAccessControlPolicy(
             final AccessControlPolicy local) throws RemoteException;
 
     /**
      * Returns a remote adapter for the given local access control manager.
      *
-     * @param acm local access control manager
+     * @param local local access control policy array
      * @return remote access control manager
      * @throws RemoteException on RMI errors
      */
-    public RemoteAccessControlPolicy[] getRemoteAccessControlPolicy(
+    RemoteAccessControlPolicy[] getRemoteAccessControlPolicy(
             final AccessControlPolicy[] local) throws RemoteException;
 
     /**
      * Returns a remote adapter for the given local access control manager.
      *
-     * @param acm local access control manager
+     * @param iterator local access control policy iterator
      * @return remote access control manager
      * @throws RemoteException on RMI errors
      */
-    public RemoteIterator getRemoteAccessControlPolicyIterator(
+    RemoteIterator getRemoteAccessControlPolicyIterator(
             AccessControlPolicyIterator iterator) throws RemoteException;
 
     /**
      * Returns a remote adapter for the given local access control manager.
      *
-     * @param acm local access control manager
+     * @param local local access control entry
      * @return remote access control manager
      * @throws RemoteException on RMI errors
      */
-    public RemoteAccessControlEntry getRemoteAccessControlEntry(
+    RemoteAccessControlEntry getRemoteAccessControlEntry(
             final AccessControlEntry local) throws RemoteException;
 
     /**
      * Returns a remote adapter for the given local access control manager.
      *
-     * @param acm local access control manager
+     * @param local local access control entry array
      * @return remote access control manager
      * @throws RemoteException on RMI errors
      */
-    public RemoteAccessControlEntry[] getRemoteAccessControlEntry(
+    RemoteAccessControlEntry[] getRemoteAccessControlEntry(
             final AccessControlEntry[] local) throws RemoteException;
 
     /**
-     * Returns a remote adapter for the given local access control manager.
+     * Factory method for creating a serializable principal.
+     * <p>
+     * If <code>p</code> is a <code>java.security.acl.Group</code> the principal
+     * returned is a serializable group.
      *
-     * @param acm local access control manager
-     * @return remote access control manager
+     * @param principal principal
+     * @return a serializable principal
      * @throws RemoteException on RMI errors
      */
-    public RemotePrincipal getRemotePrincipal(final Principal principal)
+    SerializablePrincipal getPrincipal(final Principal principal)
             throws RemoteException;
 
     /**
-     * Returns a remote adapter for the given local access control manager.
+     * Returns a remote adapter for the given local node definition template.
      *
-     * @param acm local access control manager
-     * @return remote access control manager
+     * @param ndt local node definition template
+     * @return remote node definition template
+     * @throws RemoteException on RMI errors
+     */
+    RemoteNodeDefinitionTemplate getRemoteNodeDefinitionTemplate(
+            final NodeDefinitionTemplate ndt) throws RemoteException;
+
+    /**
+     * Returns a remote adapter for the given local property definition
+     * template.
+     *
+     * @param pdt local property definition template
+     * @return remote property definition template
+     * @throws RemoteException on RMI errors
+     */
+    RemotePropertyDefinitionTemplate getRemotePropertyDefinitionTemplate(
+            final PropertyDefinitionTemplate pdt) throws RemoteException;
+
+    /**
+     * Returns a remote adapter for the given local node type template.
+     *
+     * @param ntt local node type template
+     * @return remote node type template
+     * @throws RemoteException on RMI errors
+     */
+    RemoteNodeTypeTemplate getRemoteNodeTypeTemplate(
+            final NodeTypeTemplate ntt) throws RemoteException;
+
+    /**
+     * Returns a remote adapter for the given local event journal.
+     *
+     * @param journal local event journal
+     * @return remote event journal
      * @throws RemoteException on RMI errors
      */
-    public RemoteIterator getRemotePrincipalIterator(
-            final Iterator<Principal> principals) throws RemoteException;
+    RemoteEventJournal getRemoteEventJournal(
+            final EventJournal journal) throws RemoteException;
+
+    /**
+     * Returns the local jcr object represented by the given remote stub or
+     * serializable object.
+     *
+     * @param netObject remote stub or serializable object.
+     * @return local jcr object or <code>null</code>
+     */
+    Object getJcrObject(Object netObject);
 
+    /**
+     * Returns a remote stub for the given jcr object.
+     *
+     * @param jcrObject a jcr object (Node, Item, etc.)
+     * @return remote stub or serializable object for the given jcr object or
+     *         <code>null</code>
+     */
+    Object getRemoteObject(Object jcrObject);
 }
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerList.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerList.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerList.java	(revision 0)
@@ -0,0 +1,93 @@
+package org.apache.jackrabbit.rmi.server;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.jackrabbit.rmi.remote.RemoteList;
+
+@SuppressWarnings({ "unchecked", "rawtypes" })
+public class ServerList<T extends Remote> extends ServerObject implements RemoteList<T> {
+
+    private List list;
+    private List<T> remotes;
+
+    public ServerList(List list, List<T> remotes, RemoteAdapterFactory factory)
+            throws RemoteException {
+        super(factory);
+        this.list = list;
+        this.remotes = remotes;
+    }
+
+    @Override
+    public boolean add(T e) {
+        return list.add(getJcrObject(e));
+    }
+
+    @Override
+    public boolean remove(T o) {
+        return list.remove(getJcrObject(o));
+    }
+
+    @Override
+    public boolean addAll(Collection<T> c) {
+        return list.addAll(createLocalCollection(c));
+    }
+
+    @Override
+    public boolean addAll(int index, Collection<T> c) {
+        return list.addAll(index, createLocalCollection(c));
+    }
+
+    @Override
+    public boolean removeAll(Collection<T> c) {
+        return list.removeAll(createLocalCollection(c));
+    }
+
+    @Override
+    public boolean retainAll(Collection<T> c) {
+        return list.retainAll(createLocalCollection(c));
+    }
+
+    @Override
+    public void clear() {
+        list.clear();
+    }
+
+    @Override
+    public Remote set(int index, Remote element) {
+        list.set(index, getJcrObject(element));
+        return null;
+    }
+
+    @Override
+    public void add(int index, Remote element) {
+        list.add(index, getJcrObject(element));
+    }
+
+    @Override
+    public T remove(int index) {
+        list.remove(index);
+        return null;
+    }
+
+    @Override
+    public List<T> getRemoteElements() {
+        return remotes;
+    }
+
+    private Collection createLocalCollection(Collection<T> c) {
+        Collection<T> local = new ArrayList<T>(c.size());
+        for (Remote remote : c) {
+            local.add((T)getJcrObject(remote));
+        }
+        return local;
+    }
+
+    private Object getJcrObject(Remote remote) {
+        return getFactory().getJcrObject(remote);
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java	(working copy)
@@ -38,7 +38,7 @@
  * @see javax.jcr.nodetype.NodeType
  * @see org.apache.jackrabbit.rmi.remote.RemoteNodeType
  */
-public class ServerNodeType extends ServerObject implements RemoteNodeType {
+public class ServerNodeType extends ServerNodeTypeDefinition implements RemoteNodeType {
 
     /** The adapted local node type. */
     private NodeType type;
@@ -52,7 +52,7 @@
      */
     public ServerNodeType(NodeType type, RemoteAdapterFactory factory)
             throws RemoteException {
-        super(factory);
+        super(type, factory);
         this.type = type;
     }
 
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinitionTemplate.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinitionTemplate.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinitionTemplate.java	(revision 0)
@@ -0,0 +1,107 @@
+package org.apache.jackrabbit.rmi.server;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.nodetype.PropertyDefinitionTemplate;
+
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate;
+
+/**
+ * Remote adapter for the JCR
+ * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+ * PropertyDefinitionTemplate} interface. This class makes a local property
+ * definition template available as an RMI service using the
+ * {@link org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate
+ * RemotePropertyDefinitionTemplate} interface.
+ * 
+ * @see javax.jcr.nodetype.PropertyDefinitionTemplate
+ * @see org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate
+ */
+public class ServerPropertyDefinitionTemplate extends ServerPropertyDefinition
+        implements RemotePropertyDefinitionTemplate {
+
+    /** The adapted local property definition. */
+    private PropertyDefinitionTemplate deft;
+
+    /**
+     * Creates a remote adapter for the given local property definition
+     * template.
+     * 
+     * @param deft local property definition template
+     * @param factory remote adapter factory
+     * @throws RemoteException on RMI errors
+     */
+    public ServerPropertyDefinitionTemplate(PropertyDefinitionTemplate deft,
+            RemoteAdapterFactory factory) throws RemoteException {
+        super(deft, factory);
+        this.deft = deft;
+    }
+
+    /** {@inheritDoc} */
+    public void setName(String name) throws RepositoryException,
+            RemoteException {
+        deft.setName(name);
+    }
+
+    /** {@inheritDoc} */
+    public void setAutoCreated(boolean autoCreated) throws RemoteException {
+        deft.setAutoCreated(autoCreated);
+    }
+
+    /** {@inheritDoc} */
+    public void setMandatory(boolean mandatory) throws RemoteException {
+        deft.setMandatory(mandatory);
+    }
+
+    /** {@inheritDoc} */
+    public void setOnParentVersion(int opv) throws RemoteException {
+        deft.setOnParentVersion(opv);
+    }
+
+    /** {@inheritDoc} */
+    public void setProtected(boolean protectedStatus) throws RemoteException {
+        deft.setProtected(protectedStatus);
+    }
+
+    /** {@inheritDoc} */
+    public void setRequiredType(int type) throws RemoteException {
+        deft.setRequiredType(type);
+    }
+
+    /** {@inheritDoc} */
+    public void setValueConstraints(String[] constraints)
+            throws RemoteException {
+        deft.setValueConstraints(constraints);
+    }
+
+    /** {@inheritDoc} */
+    public void setDefaultValues(Value[] defaultValues) throws RemoteException {
+        deft.setDefaultValues(defaultValues);
+    }
+
+    /** {@inheritDoc} */
+    public void setMultiple(boolean multiple) throws RemoteException {
+        deft.setMultiple(multiple);
+    }
+
+    /** {@inheritDoc} */
+    public void setAvailableQueryOperators(String[] operators)
+            throws RemoteException {
+        deft.setAvailableQueryOperators(operators);
+    }
+
+    /** {@inheritDoc} */
+    public void setFullTextSearchable(boolean fullTextSearchable)
+            throws RemoteException {
+        deft.setFullTextSearchable(fullTextSearchable);
+    }
+
+    /** {@inheritDoc} */
+    public void setQueryOrderable(boolean queryOrderable)
+            throws RemoteException {
+        deft.setQueryOrderable(queryOrderable);
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/server/security/ServerPrivilege.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/security/ServerPrivilege.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/server/security/ServerPrivilege.java	(working copy)
@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.rmi.server.security;
 
 import java.rmi.RemoteException;
-import java.rmi.server.RemoteStub;
 
 import javax.jcr.security.Privilege;
 
@@ -37,13 +36,13 @@
 
     public RemotePrivilege[] getAggregatePrivileges() throws RemoteException {
         return getFactory().getRemotePrivilege(
-            privilege.getAggregatePrivileges());
+                privilege.getAggregatePrivileges());
     }
 
     public RemotePrivilege[] getDeclaredAggregatePrivileges()
             throws RemoteException {
         return getFactory().getRemotePrivilege(
-            privilege.getDeclaredAggregatePrivileges());
+                privilege.getDeclaredAggregatePrivileges());
     }
 
     public String getName() {
@@ -61,4 +60,13 @@
     Privilege getPrivilege() {
         return privilege;
     }
+
+    public boolean isEqual(RemotePrivilege privilege) throws RemoteException {
+        return this.privilege.equals(getFactory().getJcrObject(privilege));
+    }
+
+    @Override
+    public int getHashCode() throws RemoteException {
+        return privilege.hashCode();
+    }
 }
Index: src/main/java/org/apache/jackrabbit/rmi/server/security/ServerAccessControlList.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/security/ServerAccessControlList.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/server/security/ServerAccessControlList.java	(working copy)
@@ -17,67 +17,62 @@
 package org.apache.jackrabbit.rmi.server.security;
 
 import java.rmi.RemoteException;
-import java.security.Principal;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.security.AccessControlEntry;
+import javax.jcr.security.AccessControlException;
 import javax.jcr.security.AccessControlList;
 import javax.jcr.security.Privilege;
 
-import org.apache.jackrabbit.rmi.remote.principal.RemotePrincipal;
+import org.apache.jackrabbit.rmi.client.SerializablePrincipal;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlEntry;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlList;
 import org.apache.jackrabbit.rmi.remote.security.RemotePrivilege;
 import org.apache.jackrabbit.rmi.server.RemoteAdapterFactory;
-import org.apache.jackrabbit.rmi.server.principal.ServerPrincipal;
 
 public class ServerAccessControlList extends ServerAccessControlPolicy
         implements RemoteAccessControlList {
+    private final AccessControlList acl;
 
     public ServerAccessControlList(final AccessControlList acl,
             final RemoteAdapterFactory factory) throws RemoteException {
         super(acl, factory);
+        this.acl = acl;
     }
 
     public RemoteAccessControlEntry[] getAccessControlEntries()
             throws RepositoryException, RemoteException {
         return getFactory().getRemoteAccessControlEntry(
-            ((AccessControlList) getAccessControlPolicy()).getAccessControlEntries());
+           acl.getAccessControlEntries());
     }
 
-    public boolean addAccessControlEntry(RemotePrincipal principal,
+    public boolean addAccessControlEntry(SerializablePrincipal principal,
             RemotePrivilege[] privileges) throws RepositoryException {
-
-        Principal p = null;
-        if (principal instanceof ServerPrincipal) {
-            p = ((ServerPrincipal) principal).getPrincipal();
-        }
         Privilege[] privs = new Privilege[privileges.length];
         for (int i = 0; privs != null && i < privs.length; i++) {
-            if (privileges[i] instanceof ServerPrivilege) {
-                privs[i] = ((ServerPrivilege) privileges[i]).getPrivilege();
-            } else {
-                // not a compatible remote privilege, abort
-                privs = null;
-            }
+            privs[i] = (Privilege) getFactory().getJcrObject(privileges[i]);
         }
-
-        if (p != null && privs != null) {
-            return ((AccessControlList) getAccessControlPolicy()).addAccessControlEntry(
-                p, privs);
-        }
-
-        throw new RepositoryException("Unsupported Remote types");
+        return acl.addAccessControlEntry(principal, privs);
     }
 
-    public void removeAccessControlEntry(RemoteAccessControlEntry ace)
+    public void removeAccessControlEntry(RemoteAccessControlEntry race)
             throws RepositoryException {
-        if (ace instanceof ServerAccessControlEntry) {
-            AccessControlEntry lace = ((ServerAccessControlEntry) ace).getAccessControlEntry();
-            ((AccessControlList) getAccessControlPolicy()).removeAccessControlEntry(lace);
+        AccessControlEntry ace = (AccessControlEntry) getFactory().getJcrObject(race);
+        if (ace != null ) {
+            acl.removeAccessControlEntry(ace);
         } else {
-            throw new RepositoryException(
-                "Unsupported RemoteAccessControlEntry type " + ace.getClass());
+            throw new AccessControlException(
+                    "The ace was not corectly sent to the server.");
         }
     }
+
+    @Override
+    public boolean isEqual(RemoteAccessControlList racl) throws RemoteException {
+        return acl.equals(getFactory().getJcrObject(racl));
+    }
+
+    @Override
+    public int getHashCode() throws RemoteException {
+        return acl.hashCode();
+    }
 }
Index: src/main/java/org/apache/jackrabbit/rmi/server/security/ServerAccessControlManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/security/ServerAccessControlManager.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/server/security/ServerAccessControlManager.java	(working copy)
@@ -22,6 +22,7 @@
 
 import javax.jcr.RepositoryException;
 import javax.jcr.security.AccessControlManager;
+import javax.jcr.security.AccessControlPolicy;
 import javax.jcr.security.Privilege;
 
 import org.apache.jackrabbit.rmi.remote.RemoteIterator;
@@ -45,19 +46,19 @@
     public RemoteIterator getApplicablePolicies(String absPath)
             throws RepositoryException, RemoteException {
         return getFactory().getRemoteAccessControlPolicyIterator(
-            acm.getApplicablePolicies(absPath));
+                acm.getApplicablePolicies(absPath));
     }
 
     public RemoteAccessControlPolicy[] getEffectivePolicies(String absPath)
             throws RepositoryException, RemoteException {
         return getFactory().getRemoteAccessControlPolicy(
-            acm.getEffectivePolicies(absPath));
+                acm.getEffectivePolicies(absPath));
     }
 
     public RemoteAccessControlPolicy[] getPolicies(String absPath)
             throws RepositoryException, RemoteException {
         return getFactory().getRemoteAccessControlPolicy(
-            acm.getPolicies(absPath));
+                acm.getPolicies(absPath));
     }
 
     public RemotePrivilege[] getPrivileges(String absPath)
@@ -68,7 +69,7 @@
     public RemotePrivilege[] getSupportedPrivileges(String absPath)
             throws RepositoryException, RemoteException {
         return getFactory().getRemotePrivilege(
-            acm.getSupportedPrivileges(absPath));
+                acm.getSupportedPrivileges(absPath));
     }
 
     public boolean hasPrivileges(String absPath, String[] privileges)
@@ -84,6 +85,19 @@
     public RemotePrivilege privilegeFromName(String privilegeName)
             throws RepositoryException, RemoteException {
         return getFactory().getRemotePrivilege(
-            acm.privilegeFromName(privilegeName));
+                acm.privilegeFromName(privilegeName));
+    }
+
+    public void setPolicy(String absPath, RemoteAccessControlPolicy policy)
+            throws RepositoryException, RemoteException {
+        acm.setPolicy(absPath,
+                (AccessControlPolicy) getFactory().getJcrObject(policy));
     }
+
+    public void removePolicy(String absPath, RemoteAccessControlPolicy policy)
+            throws RepositoryException, RemoteException {
+        acm.removePolicy(absPath, (AccessControlPolicy) getFactory()
+                .getJcrObject(policy));
+    }
+
 }
Index: src/main/java/org/apache/jackrabbit/rmi/server/security/ServerAccessControlEntry.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/security/ServerAccessControlEntry.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/server/security/ServerAccessControlEntry.java	(working copy)
@@ -20,7 +20,7 @@
 
 import javax.jcr.security.AccessControlEntry;
 
-import org.apache.jackrabbit.rmi.remote.principal.RemotePrincipal;
+import org.apache.jackrabbit.rmi.client.SerializablePrincipal;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlEntry;
 import org.apache.jackrabbit.rmi.remote.security.RemotePrivilege;
 import org.apache.jackrabbit.rmi.server.RemoteAdapterFactory;
@@ -37,8 +37,8 @@
         this.ace = ace;
     }
 
-    public RemotePrincipal getPrincipal() throws RemoteException {
-        return getFactory().getRemotePrincipal(ace.getPrincipal());
+    public SerializablePrincipal getPrincipal() throws RemoteException {
+        return getFactory().getPrincipal(ace.getPrincipal());
     }
 
     public RemotePrivilege[] getPrivileges() throws RemoteException {
@@ -48,4 +48,15 @@
     AccessControlEntry getAccessControlEntry() {
         return ace;
     }
+
+    @Override
+    public boolean isEqual(RemoteAccessControlEntry race)
+            throws RemoteException {
+        return ace.equals(getFactory().getJcrObject(race));
+    }
+
+    @Override
+    public int getHashCode() throws RemoteException {
+        return ace.hashCode();
+    }
 }
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerEventJournal.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerEventJournal.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerEventJournal.java	(revision 0)
@@ -0,0 +1,39 @@
+package org.apache.jackrabbit.rmi.server;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.observation.Event;
+import javax.jcr.observation.EventJournal;
+
+import org.apache.jackrabbit.rmi.client.SerializableEvent;
+import org.apache.jackrabbit.rmi.remote.RemoteEventJournal;
+import org.apache.jackrabbit.rmi.server.iterator.ServerIterator;
+
+public class ServerEventJournal extends ServerIterator implements
+        RemoteEventJournal {
+
+    private final EventJournal journal;
+
+    protected ServerEventJournal(EventJournal journal,
+            RemoteAdapterFactory factory, int maxBufferSize)
+            throws RemoteException {
+        super(journal, factory, maxBufferSize);
+        this.journal = journal;
+    }
+
+    @Override
+    public SerializableEvent nextEvent() throws RemoteException {
+        return new SerializableEvent(journal.nextEvent());
+    }
+
+    @Override
+    public void skipTo(long date) throws RemoteException {
+        journal.skipTo(date);
+    }
+
+    @Override
+    protected Object getRemoteObject(Object object) throws RemoteException {
+        return new SerializableEvent((Event) object);
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeDefinition.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeDefinition.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeDefinition.java	(revision 0)
@@ -0,0 +1,137 @@
+package org.apache.jackrabbit.rmi.server;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeTypeDefinition;
+import javax.jcr.nodetype.PropertyDefinition;
+
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeDefinition;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
+
+public class ServerNodeTypeDefinition extends ServerObject implements
+        RemoteNodeTypeDefinition {
+
+    /** The adapted local node type definition. */
+    private NodeTypeDefinition ntd;
+
+    /**
+     * Creates a remote adapter for the given local node type definition.
+     * 
+     * @param ntd local node type definition
+     * @param factory remote adapter factory
+     * @throws RemoteException on RMI errors
+     */
+    protected ServerNodeTypeDefinition(NodeTypeDefinition ntd,
+            RemoteAdapterFactory factory) throws RemoteException {
+        super(factory);
+        this.ntd = ntd;
+    }
+
+    /** {@inheritDoc} */
+    public String getName() throws RemoteException {
+        return ntd.getName();
+    }
+
+    /** {@inheritDoc} */
+    public String[] getDeclaredSupertypeNames() throws RemoteException {
+        return ntd.getDeclaredSupertypeNames();
+    }
+
+    /** {@inheritDoc} */
+    public boolean isAbstract() throws RemoteException {
+        return ntd.isAbstract();
+    }
+
+    /** {@inheritDoc} */
+    public boolean isMixin() throws RemoteException {
+        return ntd.isMixin();
+    }
+
+    /** {@inheritDoc} */
+    public boolean hasOrderableChildNodes() throws RemoteException {
+        return ntd.hasOrderableChildNodes();
+    }
+
+    /** {@inheritDoc} */
+    public boolean isQueryable() throws RemoteException {
+        return ntd.isQueryable();
+    }
+
+    /** {@inheritDoc} */
+    public String getPrimaryItemName() throws RemoteException {
+        return ntd.getPrimaryItemName();
+    }
+
+    /** {@inheritDoc} */
+    public RemotePropertyDefinition[] getDeclaredPropertyDefinitions()
+            throws RemoteException {
+        PropertyDefinition[] dpds = ntd.getDeclaredPropertyDefinitions();
+        if (dpds == null) {
+            return null;
+        } else {
+            return getRemotePropertyDefinitionArray(dpds);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteNodeDefinition[] getDeclaredChildNodeDefinitions()
+            throws RemoteException {
+        NodeDefinition[] dcnds = ntd.getDeclaredChildNodeDefinitions();
+        if (dcnds == null) {
+            return null;
+        } else {
+            return getRemoteNodeDefinitionArray(dcnds);
+        }
+    }
+
+    /**
+     * Utility method for creating an array of remote references for
+     * local node definitions. The remote references are created using the
+     * remote adapter factory.
+     * <p>
+     * A <code>null</code> input is treated as an empty array.
+     *
+     * @param defs local node definition array
+     * @return remote node definition array
+     * @throws RemoteException on RMI errors
+     */
+    private RemoteNodeDefinition[] getRemoteNodeDefinitionArray(NodeDefinition[] defs)
+            throws RemoteException {
+        if (defs != null) {
+            RemoteNodeDefinition[] remotes = new RemoteNodeDefinition[defs.length];
+            for (int i = 0; i < defs.length; i++) {
+                remotes[i] = getFactory().getRemoteNodeDefinition(defs[i]);
+            }
+            return remotes;
+        } else {
+            return new RemoteNodeDefinition[0]; // for safety
+        }
+    }
+
+    /**
+     * Utility method for creating an array of remote references for
+     * local property definitions. The remote references are created using the
+     * remote adapter factory.
+     * <p>
+     * A <code>null</code> input is treated as an empty array.
+     *
+     * @param defs local property definition array
+     * @return remote property definition array
+     * @throws RemoteException on RMI errors
+     */
+    private RemotePropertyDefinition[] getRemotePropertyDefinitionArray(PropertyDefinition[] defs)
+            throws RemoteException {
+        if (defs != null) {
+            RemotePropertyDefinition[] remotes = new RemotePropertyDefinition[defs.length];
+            for (int i = 0; i < defs.length; i++) {
+                remotes[i] = getFactory().getRemotePropertyDefinition(defs[i]);
+            }
+            return remotes;
+        } else {
+            return new RemotePropertyDefinition[0]; // for safety
+        }
+    }
+    
+}
Index: src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java	(working copy)
@@ -22,9 +22,9 @@
 import javax.jcr.Value;
 import javax.jcr.query.Query;
 
+import org.apache.jackrabbit.rmi.remote.RemoteNode;
 import org.apache.jackrabbit.rmi.remote.RemoteQuery;
 import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
-import org.apache.jackrabbit.rmi.remote.RemoteNode;
 
 /**
  * Remote adapter for the JCR {@link javax.jcr.query.Query Query} interface.
Index: src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java	(revision 1377741)
+++ src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java	(working copy)
@@ -20,14 +20,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.observation.Event;
 import javax.jcr.observation.EventIterator;
 import javax.jcr.observation.EventListener;
 
-import org.apache.jackrabbit.rmi.client.RemoteRepositoryException;
-import org.apache.jackrabbit.rmi.client.RemoteRuntimeException;
+import org.apache.jackrabbit.rmi.client.SerializableEvent;
 import org.apache.jackrabbit.rmi.iterator.ArrayEventIterator;
 import org.apache.jackrabbit.rmi.remote.RemoteEventCollection;
 import org.apache.jackrabbit.rmi.remote.RemoteObservationManager;
@@ -55,8 +52,8 @@
  */
 public class ClientEventPoll extends Thread {
 
-    /** logger */
-    private static final Logger log =
+    /** Logger for this class. */
+    private static final Logger LOG =
         LoggerFactory.getLogger(ClientEventPoll.class);
 
     /**
@@ -66,7 +63,7 @@
      */
     private static final long POLL_TIMEOUT = 5000;
 
-    /** The thread name */
+    /** The thread name. */
     private static final String THREAD_NAME = "Client Event Poller";
 
     /** The primitive unique identifier generator. */
@@ -81,10 +78,13 @@
      */
     private final Session session;
 
-    /** The map of locally registered listeners indexed by the unique identifier */
+    /**
+     * The map of locally registered listeners indexed by the unique
+     * identifier.
+     */
     private Map listenerMap = new HashMap();
 
-    /** The map of unique identifieres indexed by the registered listeners */
+    /** The map of unique identifiers indexed by the registered listeners. */
     private Map idMap = new HashMap();
 
     /**
@@ -98,15 +98,16 @@
      * {@link RemoteObservationManager}.
      *
      * @param remote The remote observation manager which is asked for new
-     *      events. This must not be <code>null</code>.
+     *        events. This must not be <code>null</code>.
      * @param session The <code>Session</code> which is asked whether it is
-     *      alive by the {@link #run()} method. This must not be <code>null</code>.
+     *        alive by the {@link #run()} method. This must not be
+     *        <code>null</code>.
      *
-     * @throws NullPointerException if <code>remote</code> or <code>session</code>
-     *      is <code>null</code>.
+     * @throws NullPointerException if <code>remote</code> or
+     *         <code>session</code> is <code>null</code>.
      */
-    public ClientEventPoll(RemoteObservationManager remote, Session session)
-            throws NullPointerException {
+    public ClientEventPoll(final RemoteObservationManager remote,
+            final Session session) throws NullPointerException {
         super(THREAD_NAME);
 
         // check remote and session
@@ -130,7 +131,7 @@
      * @return The unique identifier assigned to the newly registered event
      *      listener.
      */
-    public synchronized long addListener(EventListener listener) {
+    public final synchronized long addListener(final EventListener listener) {
         Long id = new Long(counter++);
         listenerMap.put(id, listener);
         idMap.put(listener, id);
@@ -146,7 +147,8 @@
      * @return The unique identifier assigned to the unregistered event listener
      *      or <code>-1</code> if the listener was not registered.
      */
-    public synchronized long removeListener(EventListener listener) {
+    public final synchronized long removeListener(
+            final EventListener listener) {
         Long key = (Long) idMap.remove(listener);
         if (key != null) {
             listenerMap.remove(key);
@@ -161,7 +163,7 @@
      *
      * @return registered event listeners
      */
-    public synchronized EventListener[] getListeners() {
+    public final synchronized EventListener[] getListeners() {
         return (EventListener[]) listenerMap.values().toArray(
             new EventListener[(listenerMap.size())]);
     }
@@ -172,7 +174,7 @@
      *
      * @see #run()
      */
-    public void terminate() {
+    public final void terminate() {
         this.running = false;
     }
 
@@ -195,11 +197,12 @@
      * <li>Go back to step #1.
      * </ol>
      */
-    public void run() {
+    public final void run() {
         while (running && session.isLive()) {
             try {
                 // ask for an event waiting at most POLL_TIMEOUT milliseconds
-                RemoteEventCollection remoteEvent = remote.getNextEvent(POLL_TIMEOUT);
+                RemoteEventCollection remoteEvent =
+                        remote.getNextEvent(POLL_TIMEOUT);
 
                 // poll time out, check running and ask again
                 if (remoteEvent == null) {
@@ -212,23 +215,24 @@
                 EventListener listener = (EventListener) listenerMap.get(id);
 
                 // if the listener is not registered (anymore), the event is
-                // silently ignored, running is checked and the server asked again
+                // silently ignored, running is checked and the server asked
+                // again
                 if (listener == null) {
                     continue;
                 }
 
                 // otherwise convert the remote events into an EventIterator
                 // and the listener is called
-                RemoteEventCollection.RemoteEvent[] remoteEvents = remoteEvent.getEvents();
-                EventIterator events = toEvents(remoteEvents);
+                SerializableEvent[] serEvents = remoteEvent.getEvents();
+                EventIterator events = toEvents(serEvents);
                 try {
                     listener.onEvent(events);
                 } catch (Exception e) {
-                    log.error("Unexpected failure of Listener " + listener, e);
+                    LOG.error("Unexpected failure of Listener " + listener, e);
                 }
 
             } catch (RemoteException re) {
-                log.error("Problem handling event. Looking for next one.", re);
+                LOG.error("Problem handling event. Looking for next one.", re);
             }
         }
     }
@@ -236,109 +240,17 @@
     //---------- internal -----------------------------------------------------
 
     /**
-     * Converts an array of {@link RemoteEventCollection.RemoteEvent} instances to an
+     * Converts an array of {@link SerializableEvent} instances to an
      * instance of <code>EventIterator</code> suitable to be sent to the
      * event listener.
      *
-     * @param remoteEvents array of remote events
+     * @param events array of serializable events
      * @return event iterator
      * @throws RemoteException on RMI errors
      */
-    private EventIterator toEvents(RemoteEventCollection.RemoteEvent[] remoteEvents)
+    private EventIterator toEvents(final SerializableEvent[] events)
             throws RemoteException {
-        Event[] events = new Event[remoteEvents.length];
-        for (int i = 0; i < events.length; i++) {
-            events[i] = new JCREvent(remoteEvents[i]);
-        }
         return new ArrayEventIterator(events);
     }
 
-    /**
-     * The <code>JCREvent</code> class is a simple implementation of the JCR
-     * <code>Event</code> interface to be sent to the locally registered
-     * event listeners.
-     *
-     * @author Felix Meschberger
-     */
-    private static class JCREvent implements Event {
-
-    	/** The adapted remote event. */
-    	private final RemoteEventCollection.RemoteEvent remote;
-    	
-        /**
-         * Creates an instance of this class from the contents of the given
-         * <code>remoteEvent</code>.
-         *
-         * @param remoteEvent The {@link RemoteEventCollection.RemoteEvent} instance
-         *      providing the data for this event.
-         *
-         * @throws RemoteException if an RMI error occurrs.
-         */
-        private JCREvent(RemoteEventCollection.RemoteEvent remoteEvent) throws RemoteException {
-            remote = remoteEvent;
-        }
-
-        /** {@inheritDoc} */
-        public int getType() {
-            try {
-                return remote.getType();
-            } catch (RemoteException ex) {
-                throw new RemoteRuntimeException(ex);
-            }
-        }
-
-        /** {@inheritDoc} */
-        public String getPath() throws RepositoryException {
-            try {
-                return remote.getPath();
-            } catch (RemoteException ex) {
-                throw new RemoteRepositoryException(ex);
-            }
-        }
-
-        /** {@inheritDoc} */
-        public String getUserID() {
-            try {
-                return remote.getUserID();
-            } catch (RemoteException ex) {
-                throw new RemoteRuntimeException(ex);
-            }
-        }
-
-        /** {@inheritDoc} */
-        public long getDate() throws RepositoryException {
-            try {
-                return remote.getDate();
-            } catch (RemoteException ex) {
-                throw new RemoteRepositoryException(ex);
-            }
-        }
-
-        /** {@inheritDoc} */
-        public String getIdentifier() throws RepositoryException {
-            try {
-                return remote.getIdentifier();
-            } catch (RemoteException ex) {
-                throw new RemoteRepositoryException(ex);
-            }
-        }
-
-        /** {@inheritDoc} */
-        public Map getInfo() throws RepositoryException {
-            try {
-                return remote.getInfo();
-            } catch (RemoteException ex) {
-                throw new RemoteRepositoryException(ex);
-            }
-        }
-
-        /** {@inheritDoc} */
-        public String getUserData() throws RepositoryException {
-            try {
-                return remote.getUserData();
-            } catch (RemoteException ex) {
-                throw new RemoteRepositoryException(ex);
-            }
-        }
-    }
 }
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java	(working copy)
@@ -25,16 +25,18 @@
 
 /**
  * Local adapter for the JCR-RMI
- * {@link org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition RemotePropertyDefinition}
- * interface. This class makes a remote property definition locally available
- * using the JCR {@link javax.jcr.nodetype.PropertyDefinition PropertyDef} interface.
+ * {@link org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition
+ * RemotePropertyDefinition} interface. This class makes a remote property
+ * definition locally available using the JCR
+ * {@link javax.jcr.nodetype.PropertyDefinition PropertyDef} interface.
  *
  * @see javax.jcr.nodetype.PropertyDefinition
  * @see org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition
  */
-public class ClientPropertyDefinition extends ClientItemDefinition implements PropertyDefinition {
+public class ClientPropertyDefinition extends ClientItemDefinition
+    implements PropertyDefinition {
 
-    /** The adapted remote property. */
+    /** The adapted remote property definition. */
     private RemotePropertyDefinition remote;
 
     /**
@@ -43,14 +45,14 @@
      * @param remote remote property definition
      * @param factory local adapter factory
      */
-    public ClientPropertyDefinition(
-            RemotePropertyDefinition remote, LocalAdapterFactory factory) {
+    public ClientPropertyDefinition(final RemotePropertyDefinition remote,
+            final LocalAdapterFactory factory) {
         super(remote, factory);
         this.remote = remote;
     }
 
     /** {@inheritDoc} */
-    public int getRequiredType() {
+    public final int getRequiredType() {
         try {
             return remote.getRequiredType();
         } catch (RemoteException ex) {
@@ -59,7 +61,7 @@
     }
 
     /** {@inheritDoc} */
-    public String[] getValueConstraints() {
+    public final String[] getValueConstraints() {
         try {
             return remote.getValueConstraints();
         } catch (RemoteException ex) {
@@ -68,7 +70,7 @@
     }
 
     /** {@inheritDoc} */
-    public Value[] getDefaultValues() {
+    public final Value[] getDefaultValues() {
         try {
             return remote.getDefaultValues();
         } catch (RemoteException ex) {
@@ -77,7 +79,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isMultiple() {
+    public final boolean isMultiple() {
         try {
             return remote.isMultiple();
         } catch (RemoteException ex) {
@@ -86,7 +88,7 @@
     }
 
     /** {@inheritDoc} */
-    public String[] getAvailableQueryOperators() {
+    public final String[] getAvailableQueryOperators() {
         try {
             return remote.getAvailableQueryOperators();
         } catch (RemoteException ex) {
@@ -95,7 +97,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isFullTextSearchable() {
+    public final boolean isFullTextSearchable() {
         try {
             return remote.isFullTextSearchable();
         } catch (RemoteException ex) {
@@ -104,7 +106,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isQueryOrderable() {
+    public final boolean isQueryOrderable() {
         try {
             return remote.isQueryOrderable();
         } catch (RemoteException ex) {
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinitionTemplate.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinitionTemplate.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinitionTemplate.java	(revision 0)
@@ -0,0 +1,164 @@
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.PropertyDefinitionTemplate;
+
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate
+ * RemotePropertyDefinitionTemplate} interface. This class makes a remote
+ * property definition template locally available using the JCR
+ * {@link javax.jcr.nodetype.PropertyDefinitionTemplate
+ * PropertyDefinitionTemplate} interface.
+ *
+ * @see javax.jcr.nodetype.PropertyDefinitionTemplate
+ * @see org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition
+ */
+public class ClientPropertyDefinitionTemplate extends ClientPropertyDefinition
+        implements PropertyDefinitionTemplate {
+
+    /** The adapted remote property definition template. */
+    private RemotePropertyDefinitionTemplate remote;
+
+    /**
+     * Creates a local adapter for the given remote property definition.
+     *
+     * @param remote remote property definition
+     * @param factory local adapter factory
+     */
+    public ClientPropertyDefinitionTemplate(
+            final RemotePropertyDefinitionTemplate remote,
+            final LocalAdapterFactory factory) {
+        super(remote, factory);
+        this.remote = remote;
+    }
+
+    /** {@inheritDoc} */
+    public final void setName(final String name)
+            throws ConstraintViolationException {
+        try {
+            remote.setName(name);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        } catch (RepositoryException ex) {
+            throw new ConstraintViolationException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setAutoCreated(final boolean autoCreated) {
+        try {
+            remote.setAutoCreated(autoCreated);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+
+    }
+
+    /** {@inheritDoc} */
+    public final void setMandatory(final boolean mandatory) {
+        try {
+            remote.setMandatory(mandatory);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+
+    }
+
+    /** {@inheritDoc} */
+    public final void setOnParentVersion(final int opv) {
+        try {
+            remote.setOnParentVersion(opv);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+
+    }
+
+    /** {@inheritDoc} */
+    public final void setProtected(final boolean protectedStatus) {
+        try {
+            remote.setProtected(protectedStatus);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+
+    }
+
+    /** {@inheritDoc} */
+    public final void setRequiredType(final int type) {
+        try {
+            remote.setRequiredType(type);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+
+    }
+
+    /** {@inheritDoc} */
+    public final void setValueConstraints(final String[] constraints) {
+        try {
+            remote.setValueConstraints(constraints);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+
+    }
+
+    /** {@inheritDoc} */
+    public final void setDefaultValues(final Value[] defaultValues) {
+        try {
+            remote.setDefaultValues(defaultValues);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+
+    }
+
+    /** {@inheritDoc} */
+    public final void setMultiple(final boolean multiple) {
+        try {
+            remote.setMultiple(multiple);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+
+    }
+
+    /** {@inheritDoc} */
+    public final void setAvailableQueryOperators(final String[] operators) {
+        try {
+            remote.setAvailableQueryOperators(operators);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+
+    }
+
+    /** {@inheritDoc} */
+    public final void setFullTextSearchable(final boolean fullTextSearchable) {
+        try {
+            remote.setFullTextSearchable(fullTextSearchable);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+
+    }
+
+    /** {@inheritDoc} */
+    public final void setQueryOrderable(final boolean queryOrderable) {
+        try {
+            remote.setQueryOrderable(queryOrderable);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientList.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientList.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientList.java	(revision 0)
@@ -0,0 +1,135 @@
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.jackrabbit.rmi.remote.RemoteList;
+
+public class ClientList<T extends Remote, S> extends ArrayList<S> {
+        private RemoteList<T> remote;
+        private LocalAdapterFactory factory;
+
+        public ClientList(RemoteList<T> remote, List<S> elements, LocalAdapterFactory factory) {
+            super(elements);
+            this.remote = remote;
+            this.factory = factory;
+        }
+
+        @Override
+        public boolean add(S e) {
+            try {
+                remote.add(getRemoteObject(e));
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+            return super.add(e);
+        }
+
+        @Override
+        public boolean remove(Object o) {
+            try {
+                remote.remove(getRemoteObject(o));
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+            return super.remove(o);
+        }
+
+        @Override
+        public boolean addAll(Collection<? extends S> c) {
+            try {
+                remote.addAll(getRemoteObjects(c));
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+            return super.addAll(c);
+        }
+
+        @Override
+        public boolean addAll(int index, Collection<? extends S> c) {
+            try {
+                remote.addAll(index, getRemoteObjects(c));
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+            return super.addAll(index, c);
+        }
+
+        @Override
+        public boolean removeAll(Collection<?> c) {
+            try {
+                remote.removeAll(getRemoteObjects(c));
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+            return super.removeAll(c);
+        }
+
+        @Override
+        public boolean retainAll(Collection<?> c) {
+            try {
+                remote.retainAll(getRemoteObjects(c));
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+            return super.retainAll(c);
+        }
+
+        @Override
+        public void clear() {
+            try {
+                remote.clear();
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+            super.clear();
+        }
+
+        @Override
+        public S set(int index, S element) {
+            try {
+                remote.set(index, getRemoteObject(element));
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+            return super.set(index, element);
+        }
+
+        @Override
+        public void add(int index, S element) {
+            try {
+                remote.add(index, getRemoteObject(element));
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+            super.add(index, element);
+        }
+
+        @Override
+        public S remove(int index) {
+            try {
+                remote.remove(index);
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+            return super.remove(index);
+        }
+
+        @SuppressWarnings("unchecked")
+        private T getRemoteObject(Object o) {
+            return (T) factory.getRemoteObject(o);
+        }
+
+        private Collection<T> getRemoteObjects(Collection<?> os){
+            Collection<T> result = new ArrayList<T>(os.size());
+            for (Object object : os) {
+                result.add(getRemoteObject(object));
+            }
+            return result;
+        }
+
+    }
+
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinitionTemplate.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinitionTemplate.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinitionTemplate.java	(revision 0)
@@ -0,0 +1,122 @@
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NodeDefinitionTemplate;
+
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinitionTemplate;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeDefinitionTemplate
+ * RemoteNodeDefinitionTemplate} interface. This class makes a remote node
+ * definition template locally available using the JCR
+ * {@link javax.jcr.nodetype.NodeDefinitionTemplate NodeDefinitionTemplate}
+ * interface.
+ *
+ * @see javax.jcr.nodetype.NodeDefinitionTemplate
+ * @see org.apache.jackrabbit.rmi.remote.RemoteNodeDefinitionTemplate
+ */
+public class ClientNodeDefinitionTemplate extends ClientNodeDefinition
+        implements NodeDefinitionTemplate {
+
+    /** The adapted remote node definition template. */
+    private RemoteNodeDefinitionTemplate remote;
+
+    /**
+     * Creates a local adapter for the given remote node definition template.
+     *
+     * @param remote remote node definition template
+     * @param factory local adapter factory
+     */
+    public ClientNodeDefinitionTemplate(
+            final RemoteNodeDefinitionTemplate remote,
+            final LocalAdapterFactory factory) {
+        super(remote, factory);
+        this.remote = remote;
+    }
+
+    /** {@inheritDoc} */
+    public final void setName(final String name)
+            throws ConstraintViolationException {
+        try {
+            remote.setName(name);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        } catch (RepositoryException e) {
+            throw new ConstraintViolationException(e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setAutoCreated(final boolean autoCreated) {
+        try {
+            remote.setAutoCreated(autoCreated);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setMandatory(final boolean mandatory) {
+        try {
+            remote.setMandatory(mandatory);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setOnParentVersion(final int opv) {
+        try {
+            remote.setOnParentVersion(opv);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setProtected(final boolean protectedStatus) {
+        try {
+            remote.setProtected(protectedStatus);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setRequiredPrimaryTypeNames(final String[] names)
+            throws ConstraintViolationException {
+        try {
+            remote.setRequiredPrimaryTypeNames(names);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        } catch (RepositoryException e) {
+            throw new ConstraintViolationException(e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setDefaultPrimaryTypeName(final String name)
+            throws ConstraintViolationException {
+        try {
+            remote.setDefaultPrimaryTypeName(name);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        } catch (RepositoryException e) {
+            throw new ConstraintViolationException(e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setSameNameSiblings(final boolean allowSameNameSiblings) {
+        try {
+            remote.setSameNameSiblings(allowSameNameSiblings);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeTemplate.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeTemplate.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeTemplate.java	(revision 0)
@@ -0,0 +1,195 @@
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NodeDefinitionTemplate;
+import javax.jcr.nodetype.NodeTypeTemplate;
+import javax.jcr.nodetype.PropertyDefinitionTemplate;
+
+import org.apache.jackrabbit.rmi.remote.RemoteList;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinitionTemplate;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeTemplate;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeTypeTemplate
+ * RemoteNodeTypeTemplate} interface. This class makes a remote node type
+ * template locally available using the JCR
+ * {@link javax.jcr.nodetype.NodeTypeTemplate NodeTypeTemplate} interface.
+ *
+ * @see javax.jcr.nodetype.NodeTypeTemplate
+ * @see org.apache.jackrabbit.rmi.remote.RemoteNodeTypeTemplate
+ */
+public class ClientNodeTypeTemplate extends ClientNodeTypeDefinition implements
+        NodeTypeTemplate {
+
+    /** The adapted remote node type definition. */
+    private RemoteNodeTypeTemplate remote;
+
+    /**
+     * Creates a local adapter for the given remote node type definition.
+     *
+     * @param remote remote node type definition
+     * @param factory local adapter factory
+     */
+    public ClientNodeTypeTemplate(final RemoteNodeTypeTemplate remote,
+            final LocalAdapterFactory factory) {
+        super(remote, factory);
+        this.remote = remote;
+    }
+
+    /** {@inheritDoc} */
+    public final void setName(final String name)
+            throws ConstraintViolationException {
+        try {
+            remote.setName(name);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setDeclaredSuperTypeNames(final String[] names)
+            throws ConstraintViolationException {
+        try {
+            remote.setDeclaredSuperTypeNames(names);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setAbstract(final boolean abstractStatus) {
+        try {
+            remote.setAbstract(abstractStatus);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setMixin(final boolean mixin) {
+        try {
+            remote.setMixin(mixin);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setOrderableChildNodes(final boolean orderable) {
+        try {
+            remote.setOrderableChildNodes(orderable);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setPrimaryItemName(final String name)
+            throws ConstraintViolationException {
+        try {
+            remote.setPrimaryItemName(name);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void setQueryable(final boolean queryable) {
+        try {
+            remote.setQueryable(queryable);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final List<PropertyDefinitionTemplate>
+                    getPropertyDefinitionTemplates() {
+        try {
+            RemoteList<RemotePropertyDefinitionTemplate> list =
+                    remote.getPropertyDefinitionTemplates();
+            List<RemotePropertyDefinitionTemplate> remotes =
+                    list.getRemoteElements();
+            return getPropertyDefTempList(list, remotes);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final List<NodeDefinitionTemplate> getNodeDefinitionTemplates() {
+        try {
+            RemoteList<RemoteNodeDefinitionTemplate> list =
+                    remote.getNodeDefinitionTemplates();
+            List<RemoteNodeDefinitionTemplate> remotes =
+                    list.getRemoteElements();
+            return getNodeDefTempList(list, remotes);
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /**
+     * Utility method for creating a list of local property definition template
+     * adapters for an array of remote property definition templates. The
+     * property definition template adapters are created using the local adapter
+     * factory.
+     * <p>
+     * A <code>null</code> input is treated as an empty array.
+     *
+     * @param list remote list adapter for the remote property definition
+     *        templates
+     * @param remotes remote property definition templates
+     * @return local property definition template list
+     */
+    @SuppressWarnings("unchecked")
+    private <S extends PropertyDefinitionTemplate, 
+                T extends RemotePropertyDefinitionTemplate> List<S>
+                getPropertyDefTempList(
+                        final RemoteList<T> list, final List<T> remotes) {
+        if (remotes != null) {
+            List<S> defs = new ArrayList<S>(remotes.size());
+            for (T remote : remotes) {
+                defs.add((S) getFactory().getPropertyDefTemp(remote));
+            }
+            return new ClientList<T, S>(list, defs, getFactory());
+        } else {
+            return Collections.emptyList(); // for safety
+        }
+    }
+
+    /**
+     * Utility method for creating a list of local node definition template
+     * adapters for an array of remote node definition templates. The node
+     * definition template adapters are created using the local adapter factory.
+     * <p>
+     * A <code>null</code> input is treated as an empty array.
+     *
+     * @param list remote list adapter for the remote node definition templates
+     * @param remotes remote node definition templates
+     * @return local node definition template list
+     */
+    @SuppressWarnings("unchecked")
+    private <S extends NodeDefinitionTemplate,
+                T extends RemoteNodeDefinitionTemplate> List<S>
+                getNodeDefTempList(
+                        final RemoteList<T> list, final List<T> remotes) {
+        if (remotes != null) {
+            List<S> defs = new ArrayList<S>(remotes.size());
+            for (T remote : remotes) {
+                defs.add((S) getFactory().getNodeDefTemp(remote));
+            }
+            return new ClientList<T, S>(list, defs, getFactory());
+        } else {
+            return Collections.emptyList(); // for safety
+        }
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/client/security/ClientPrivilege.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/security/ClientPrivilege.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/security/ClientPrivilege.java	(working copy)
@@ -37,8 +37,15 @@
  */
 public class ClientPrivilege extends ClientObject implements Privilege {
 
+    /** The adapted remote privilege. */
     private final RemotePrivilege rp;
 
+    /**
+     * Creates a local adapter for the given remote privilege.
+     *
+     * @param rp remote privilege
+     * @param factory local adapter factory
+     */
     public ClientPrivilege(final RemotePrivilege rp,
             final LocalAdapterFactory factory) {
         super(factory);
@@ -46,7 +53,7 @@
     }
 
     /** {@inheritDoc} */
-    public Privilege[] getAggregatePrivileges() {
+    public final Privilege[] getAggregatePrivileges() {
         try {
             return getFactory().getPrivilege(rp.getAggregatePrivileges());
         } catch (RemoteException re) {
@@ -55,7 +62,7 @@
     }
 
     /** {@inheritDoc} */
-    public Privilege[] getDeclaredAggregatePrivileges() {
+    public final Privilege[] getDeclaredAggregatePrivileges() {
         try {
             return getFactory().getPrivilege(
                 rp.getDeclaredAggregatePrivileges());
@@ -65,7 +72,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getName() {
+    public final String getName() {
         try {
             return rp.getName();
         } catch (RemoteException re) {
@@ -74,7 +81,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isAbstract() {
+    public final boolean isAbstract() {
         try {
             return rp.isAbstract();
         } catch (RemoteException re) {
@@ -83,7 +90,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isAggregate() {
+    public final boolean isAggregate() {
         try {
             return rp.isAggregate();
         } catch (RemoteException re) {
@@ -91,7 +98,10 @@
         }
     }
 
-    public boolean equals(Object obj) {
+    /**
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    public final boolean equals(final Object obj) {
         if (obj == this) {
             return true;
         } else if (obj == null) {
@@ -99,13 +109,26 @@
         }
 
         if (obj instanceof Privilege) {
-            return getName().equals(((Privilege) obj).getName());
+            RemotePrivilege other =
+                    (RemotePrivilege) getFactory().getRemoteObject(obj);
+            try {
+                return rp.isEqual(other);
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
         }
-
         return false;
     }
 
-    public int hashCode() {
-        return getName().hashCode();
+    /**
+     * @see java.lang.Object#hashCode()
+     */
+    public final int hashCode() {
+        try {
+            return rp.getHashCode();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
+
 }
Index: src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlEntry.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlEntry.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlEntry.java	(working copy)
@@ -41,8 +41,20 @@
 public class ClientAccessControlEntry extends ClientObject implements
         AccessControlEntry {
 
+    /** The adapted remote access control entry. */
     private final RemoteAccessControlEntry race;
 
+    /**
+     * Hash code being calculated on demand.
+     */
+    private int hashCode = -1;
+
+    /**
+     * Creates a local adapter for the given remote access control entry.
+     *
+     * @param race remote access control entry
+     * @param factory local adapter factory
+     */
     public ClientAccessControlEntry(final RemoteAccessControlEntry race,
             final LocalAdapterFactory factory) {
         super(factory);
@@ -50,7 +62,7 @@
     }
 
     /** {@inheritDoc} */
-    public Principal getPrincipal() {
+    public final Principal getPrincipal() {
         try {
             return getFactory().getPrincipal(race.getPrincipal());
         } catch (RemoteException re) {
@@ -59,7 +71,7 @@
     }
 
     /** {@inheritDoc} */
-    public Privilege[] getPrivileges() {
+    public final Privilege[] getPrivileges() {
         try {
             return getFactory().getPrivilege(race.getPrivileges());
         } catch (RemoteException re) {
@@ -67,7 +79,34 @@
         }
     }
 
-    RemoteAccessControlEntry getRemoteAccessControlEntry() {
-        return race;
+    /**
+     * @see Object#hashCode()
+     */
+    public final int hashCode() {
+        if (hashCode == -1) {
+            try {
+                hashCode = race.getHashCode();
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+        }
+        return hashCode;
+    }
+
+    /**
+     * @see Object#equals(Object)
+     */
+    public final boolean equals(final Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj == null) {
+            return false;
+        }
+        try {
+            return race.isEqual((RemoteAccessControlEntry) getFactory()
+                    .getRemoteObject(obj));
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 }
Index: src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlManager.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlManager.java	(working copy)
@@ -23,16 +23,19 @@
 import javax.jcr.AccessDeniedException;
 import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.lock.LockException;
 import javax.jcr.security.AccessControlException;
 import javax.jcr.security.AccessControlManager;
 import javax.jcr.security.AccessControlPolicy;
 import javax.jcr.security.AccessControlPolicyIterator;
 import javax.jcr.security.Privilege;
+import javax.jcr.version.VersionException;
+
 import org.apache.jackrabbit.rmi.client.ClientObject;
 import org.apache.jackrabbit.rmi.client.LocalAdapterFactory;
 import org.apache.jackrabbit.rmi.client.RemoteRepositoryException;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlManager;
+import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlPolicy;
 
 /**
  * Local adapter for the JCR-RMI {@link RemoteAccessControlManager
@@ -46,8 +49,15 @@
 public class ClientAccessControlManager extends ClientObject implements
         AccessControlManager {
 
+    /** The adapted remote access control manager. */
     private final RemoteAccessControlManager racm;
 
+    /**
+     * Creates a local adapter for the given remote privilege.
+     *
+     * @param racm remote access control manager
+     * @param factory local adapter factory
+     */
     public ClientAccessControlManager(final RemoteAccessControlManager racm,
             final LocalAdapterFactory factory) {
         super(factory);
@@ -55,8 +65,8 @@
     }
 
     /** {@inheritDoc} */
-    public AccessControlPolicyIterator getApplicablePolicies(String absPath)
-            throws RepositoryException {
+    public final AccessControlPolicyIterator getApplicablePolicies(
+            final String absPath) throws RepositoryException {
         try {
             return getFactory().getAccessControlPolicyIterator(
                 racm.getApplicablePolicies(absPath));
@@ -66,9 +76,9 @@
     }
 
     /** {@inheritDoc} */
-    public AccessControlPolicy[] getEffectivePolicies(String absPath)
-            throws PathNotFoundException, AccessDeniedException,
-            RepositoryException {
+    public final AccessControlPolicy[] getEffectivePolicies(
+            final String absPath) throws PathNotFoundException,
+                AccessDeniedException, RepositoryException {
         try {
             return getFactory().getAccessControlPolicy(
                 racm.getEffectivePolicies(absPath));
@@ -78,7 +88,7 @@
     }
 
     /** {@inheritDoc} */
-    public AccessControlPolicy[] getPolicies(String absPath)
+    public final AccessControlPolicy[] getPolicies(final String absPath)
             throws PathNotFoundException, AccessDeniedException,
             RepositoryException {
         try {
@@ -90,7 +100,7 @@
     }
 
     /** {@inheritDoc} */
-    public Privilege[] getPrivileges(String absPath)
+    public final Privilege[] getPrivileges(final String absPath)
             throws PathNotFoundException, RepositoryException {
         try {
             return getFactory().getPrivilege(racm.getPrivileges(absPath));
@@ -100,7 +110,7 @@
     }
 
     /** {@inheritDoc} */
-    public Privilege[] getSupportedPrivileges(String absPath)
+    public final Privilege[] getSupportedPrivileges(final String absPath)
             throws PathNotFoundException, RepositoryException {
         try {
             return getFactory().getPrivilege(
@@ -111,8 +121,9 @@
     }
 
     /** {@inheritDoc} */
-    public boolean hasPrivileges(String absPath, Privilege[] privileges)
-            throws PathNotFoundException, RepositoryException {
+    public final boolean hasPrivileges(final String absPath,
+            final Privilege[] privileges)
+                    throws PathNotFoundException, RepositoryException {
         String[] privNames = new String[privileges.length];
         for (int i = 0; i < privNames.length; i++) {
             privNames[i] = privileges[i].getName();
@@ -127,7 +138,7 @@
     }
 
     /** {@inheritDoc} */
-    public Privilege privilegeFromName(String privilegeName)
+    public final Privilege privilegeFromName(final String privilegeName)
             throws AccessControlException, RepositoryException {
         try {
             return getFactory().getPrivilege(
@@ -137,23 +148,31 @@
         }
     }
 
-    /**
-     * @throws UnsupportedRepositoryOperationException This method is not
-     *             implemented yet
-     */
-    public void removePolicy(String absPath, AccessControlPolicy policy)
-            throws UnsupportedRepositoryOperationException {
-        // TODO: implement client side of the story
-        throw new UnsupportedRepositoryOperationException("removePolicy");
+    /** {@inheritDoc} */
+    public final void setPolicy(final String absPath,
+                final AccessControlPolicy policy)
+            throws PathNotFoundException, AccessControlException,
+            AccessDeniedException, LockException, VersionException,
+            RepositoryException {
+        try {
+            racm.setPolicy(absPath, (RemoteAccessControlPolicy) getFactory()
+                    .getRemoteObject(policy));
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
-    /**
-     * @throws UnsupportedRepositoryOperationException This method is not
-     *             implemented yet
-     */
-    public void setPolicy(String absPath, AccessControlPolicy policy)
-            throws UnsupportedRepositoryOperationException {
-        // TODO: implement client side of the story
-        throw new UnsupportedRepositoryOperationException("setPolicy");
+    /** {@inheritDoc} */
+    public final void removePolicy(final String absPath,
+            final AccessControlPolicy policy)
+            throws PathNotFoundException, AccessControlException,
+            AccessDeniedException, LockException, VersionException,
+            RepositoryException {
+        try {
+            racm.removePolicy(absPath, (RemoteAccessControlPolicy) getFactory().
+                    getRemoteObject(policy));
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 }
Index: src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlList.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlList.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlList.java	(working copy)
@@ -22,14 +22,18 @@
 import java.security.Principal;
 
 import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.security.AccessControlEntry;
+import javax.jcr.security.AccessControlException;
 import javax.jcr.security.AccessControlList;
 import javax.jcr.security.Privilege;
 
 import org.apache.jackrabbit.rmi.client.LocalAdapterFactory;
 import org.apache.jackrabbit.rmi.client.RemoteRepositoryException;
+import org.apache.jackrabbit.rmi.client.RemoteRuntimeException;
+import org.apache.jackrabbit.rmi.client.SerializablePrincipal;
+import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlEntry;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlList;
+import org.apache.jackrabbit.rmi.remote.security.RemotePrivilege;
 
 /**
  * Local adapter for the JCR-RMI {@link RemoteAccessControlList
@@ -43,43 +47,92 @@
 public class ClientAccessControlList extends ClientAccessControlPolicy
         implements AccessControlList {
 
-    public ClientAccessControlList(final RemoteAccessControlList racl,
-            final LocalAdapterFactory factory) {
-        super(racl, factory);
-    }
+    /** The adapted remote access control list. */
+    private final RemoteAccessControlList racl;
 
     /**
-     * @throws UnsupportedRepositoryOperationException This method is not
-     *             implemented yet
+     * Creates a local adapter for the given remote access control list.
+     *
+     * @param racl remote access control list
+     * @param factory local adapter factory
      */
-    public boolean addAccessControlEntry(Principal principal,
-            Privilege[] privileges)
-            throws UnsupportedRepositoryOperationException {
-        // TODO: implement client side of the story
-        throw new UnsupportedRepositoryOperationException(
-            "addAccessControlEntry");
+    public ClientAccessControlList(final RemoteAccessControlList racl,
+            final LocalAdapterFactory factory) {
+        super(racl, factory);
+        this.racl = racl;
     }
 
     /** {@inheritDoc} */
-    public AccessControlEntry[] getAccessControlEntries()
+    public final AccessControlEntry[] getAccessControlEntries()
             throws RepositoryException {
         try {
             return getFactory().getAccessControlEntry(
-                ((RemoteAccessControlList) getRemoteAccessControlPolicy()).getAccessControlEntries());
+                    ((RemoteAccessControlList) getRemoteAccessControlPolicy())
+                            .getAccessControlEntries());
         } catch (RemoteException re) {
             throw new RemoteRepositoryException(re);
         }
     }
 
+    /** {@inheritDoc} */
+    public final boolean addAccessControlEntry(final Principal principal,
+            final Privilege[] privileges) throws AccessControlException,
+            RepositoryException {
+        try {
+            RemotePrivilege[] remote = new RemotePrivilege[privileges.length];
+            for (int i = 0; i < privileges.length; i++) {
+                remote[i] = (RemotePrivilege) getFactory().getRemoteObject(
+                        privileges[i]);
+                if (remote[i] == null) {
+                    throw new AccessControlException("Unknown privilege '"
+                            + privileges[i].getName() + "'.");
+                }
+            }
+            SerializablePrincipal p = getFactory().getPrincipal(principal);
+            return racl.addAccessControlEntry(p, remote);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final void removeAccessControlEntry(final AccessControlEntry ace)
+            throws AccessControlException, RepositoryException {
+        try {
+            racl.removeAccessControlEntry(
+                    (RemoteAccessControlEntry) getFactory()
+                    .getRemoteObject(ace));
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
     /**
-     * @throws UnsupportedRepositoryOperationException This method is not
-     *             implemented yet
+     * @see Object#hashCode()
      */
-    public void removeAccessControlEntry(AccessControlEntry ace)
-            throws UnsupportedRepositoryOperationException {
-        // TODO: implement client side of the story
-        throw new UnsupportedRepositoryOperationException(
-            "removeAccessControlEntry");
+    public final boolean equals(final Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj == null) {
+            return false;
+        }
+        try {
+            return racl.isEqual((RemoteAccessControlList) getFactory()
+                    .getRemoteObject(obj));
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /**
+     * @see Object#equals(Object)
+     */
+    public final int hashCode() {
+        try {
+            return racl.getHashCode();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
     }
 
 }
Index: src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlPolicy.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlPolicy.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/security/ClientAccessControlPolicy.java	(working copy)
@@ -19,6 +19,7 @@
 package org.apache.jackrabbit.rmi.client.security;
 
 import javax.jcr.security.AccessControlPolicy;
+
 import org.apache.jackrabbit.rmi.client.ClientObject;
 import org.apache.jackrabbit.rmi.client.LocalAdapterFactory;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlPolicy;
@@ -35,15 +36,26 @@
 public class ClientAccessControlPolicy extends ClientObject implements
         AccessControlPolicy {
 
+    /** The adapted remote access control policy. */
     private final RemoteAccessControlPolicy racp;
 
+    /**
+     * Creates a local adapter for the given remote access control policy.
+     *
+     * @param racp remote access control policy
+     * @param factory local adapter factory
+     */
     public ClientAccessControlPolicy(final RemoteAccessControlPolicy racp,
             final LocalAdapterFactory factory) {
         super(factory);
         this.racp = racp;
     }
 
-    RemoteAccessControlPolicy getRemoteAccessControlPolicy() {
+    /**
+     * Returns the adapted remote access control policy.
+     * @return remote access control policy
+     */
+    final RemoteAccessControlPolicy getRemoteAccessControlPolicy() {
         return racp;
     }
 
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java	(working copy)
@@ -26,14 +26,16 @@
 
 /**
  * Local adapter for the JCR-RMI
- * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition RemoteNodeDefinition}
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition
+ * RemoteNodeDefinition}
  * interface. This class makes a remote node definition locally available using
  * the JCR {@link javax.jcr.nodetype.NodeDefinition NodeDef} interface.
  *
  * @see javax.jcr.nodetype.NodeDefinition
  * @see org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition
  */
-public class ClientNodeDefinition extends ClientItemDefinition implements NodeDefinition {
+public class ClientNodeDefinition
+    extends ClientItemDefinition implements NodeDefinition {
 
     /** The adapted remote node definition. */
     private RemoteNodeDefinition remote;
@@ -44,22 +46,28 @@
      * @param remote remote node definition
      * @param factory local adapter factory
      */
-    public ClientNodeDefinition(RemoteNodeDefinition remote, LocalAdapterFactory factory) {
+    public ClientNodeDefinition(final RemoteNodeDefinition remote,
+            final LocalAdapterFactory factory) {
         super(remote, factory);
         this.remote = remote;
     }
 
     /** {@inheritDoc} */
-    public NodeType[] getRequiredPrimaryTypes() {
+    public final NodeType[] getRequiredPrimaryTypes() {
         try {
-            return getNodeTypeArray(remote.getRequiredPrimaryTypes());
+            RemoteNodeType[] rpt = remote.getRequiredPrimaryTypes();
+            if (rpt == null) {
+                return null;
+            } else {
+                return getNodeTypeArray(rpt);
+            }
         } catch (RemoteException ex) {
             throw new RemoteRuntimeException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public NodeType getDefaultPrimaryType() {
+    public final NodeType getDefaultPrimaryType() {
         try {
             RemoteNodeType nt = remote.getDefaultPrimaryType();
             if (nt == null) {
@@ -73,7 +81,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean allowsSameNameSiblings() {
+    public final boolean allowsSameNameSiblings() {
         try {
             return remote.allowsSameNameSiblings();
         } catch (RemoteException ex) {
@@ -82,7 +90,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getDefaultPrimaryTypeName() {
+    public final String getDefaultPrimaryTypeName() {
         try {
             return remote.getDefaultPrimaryTypeName();
         } catch (RemoteException ex) {
@@ -91,7 +99,7 @@
     }
 
     /** {@inheritDoc} */
-    public String[] getRequiredPrimaryTypeNames() {
+    public final String[] getRequiredPrimaryTypeNames() {
         try {
             return remote.getRequiredPrimaryTypeNames();
         } catch (RemoteException ex) {
Index: src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientIterator.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientIterator.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientIterator.java	(working copy)
@@ -45,19 +45,19 @@
      * size is unknown, or -2 if the size has not been retrieved from the
      * remote iterator.
      */
-    private long size;
+    protected long size;
 
     /** The position of the buffer within the iteration. */
-    private long positionOfBuffer;
+    protected long positionOfBuffer;
 
     /** The position within the buffer of the iteration. */
-    private int positionInBuffer;
+    protected int positionInBuffer;
 
     /**
      * The element buffer. Set to <code>null</code> when the end of the
      * iteration has been reached.
      */
-    private Object[] buffer;
+    protected Object[] buffer;
 
     /**
      * Creates a local adapter for the given remote iterator. The element
@@ -149,7 +149,7 @@
      *
      * @throws RemoteException on RMI errors
      */
-    private void advance() throws RemoteException {
+    protected void advance() throws RemoteException {
         if (buffer != null && positionInBuffer == buffer.length) {
             positionOfBuffer += buffer.length;
             positionInBuffer = 0;
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientNode.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientNode.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientNode.java	(working copy)
@@ -63,8 +63,8 @@
      * @param remote  remote node
      * @param factory local adapter factory
      */
-    public ClientNode(
-            Session session, RemoteNode remote, LocalAdapterFactory factory) {
+    public ClientNode(final Session session, final RemoteNode remote,
+            final LocalAdapterFactory factory) {
         super(session, remote, factory);
         this.remote = remote;
     }
@@ -74,7 +74,7 @@
      *
      * {@inheritDoc}
      */
-    public boolean isNode() {
+    public final boolean isNode() {
         return true;
     }
 
@@ -85,12 +85,13 @@
      *
      * {@inheritDoc}
      */
-    public void accept(ItemVisitor visitor) throws RepositoryException {
+    public final void accept(final ItemVisitor visitor)
+            throws RepositoryException {
         visitor.visit(this);
     }
 
     /** {@inheritDoc} */
-    public Node addNode(String path) throws RepositoryException {
+    public final Node addNode(final String path) throws RepositoryException {
         try {
             return getNode(getSession(), remote.addNode(path));
         } catch (RemoteException ex) {
@@ -99,7 +100,8 @@
     }
 
     /** {@inheritDoc} */
-    public Node addNode(String path, String type) throws RepositoryException {
+    public final Node addNode(final String path, final String type)
+            throws RepositoryException {
         try {
             RemoteNode node = remote.addNode(path, type);
             return getNode(getSession(), node);
@@ -109,7 +111,8 @@
     }
 
     /** {@inheritDoc} */
-    public void orderBefore(String src, String dst) throws RepositoryException {
+    public final void orderBefore(final String src, final String dst)
+            throws RepositoryException {
         try {
             remote.orderBefore(src, dst);
         } catch (RemoteException ex) {
@@ -118,7 +121,7 @@
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, Value value)
+    public final Property setProperty(final String name, final Value value)
             throws RepositoryException {
         try {
             if (value == null) {
@@ -135,14 +138,15 @@
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, Value[] values)
+    public final Property setProperty(final String name, final Value[] values)
             throws RepositoryException {
         try {
             if (values == null) {
                 remote.setProperty(name, values);
                 return null;
             } else {
-                Value[] serials = SerialValueFactory.makeSerialValueArray(values);
+                Value[] serials =
+                        SerialValueFactory.makeSerialValueArray(values);
                 RemoteProperty property = remote.setProperty(name, serials);
                 return getFactory().getProperty(getSession(), property);
             }
@@ -152,14 +156,15 @@
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, String[] strings)
+    public final Property setProperty(final String name, final String[] strings)
             throws RepositoryException {
         try {
             if (strings == null) {
                 remote.setProperty(name, (Value[]) null);
                 return null;
             } else {
-                Value[] serials = SerialValueFactory.makeSerialValueArray(strings);
+                Value[] serials =
+                        SerialValueFactory.makeSerialValueArray(strings);
                 RemoteProperty property = remote.setProperty(name, serials);
                 return getFactory().getProperty(getSession(), property);
             }
@@ -169,65 +174,72 @@
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, String value)
+    public final Property setProperty(final String name, final String value)
             throws RepositoryException {
         if (value == null) {
             return setProperty(name, (Value) null);
         } else {
-            return setProperty(name, getSession().getValueFactory().createValue(value));
+            return setProperty(name,
+                    getSession().getValueFactory().createValue(value));
         }
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, InputStream value)
-            throws RepositoryException {
+    public final Property setProperty(final String name,
+            final InputStream value) throws RepositoryException {
         if (value == null) {
             return setProperty(name, (Value) null);
         } else {
-            return setProperty(name, getSession().getValueFactory().createValue(value));
+            return setProperty(name,
+                    getSession().getValueFactory().createValue(value));
         }
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, boolean value)
+    public final Property setProperty(final String name, final boolean value)
             throws RepositoryException {
-        return setProperty(name, getSession().getValueFactory().createValue(value));
+        return setProperty(name,
+                getSession().getValueFactory().createValue(value));
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, double value)
+    public final Property setProperty(final String name, final double value)
             throws RepositoryException {
-        return setProperty(name, getSession().getValueFactory().createValue(value));
+        return setProperty(name,
+                getSession().getValueFactory().createValue(value));
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, long value)
+    public final Property setProperty(final String name, final long value)
             throws RepositoryException {
-        return setProperty(name, getSession().getValueFactory().createValue(value));
+        return setProperty(name,
+                getSession().getValueFactory().createValue(value));
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, Calendar value)
+    public final Property setProperty(final String name, final Calendar value)
             throws RepositoryException {
         if (value == null) {
             return setProperty(name, (Value) null);
         } else {
-            return setProperty(name, getSession().getValueFactory().createValue(value));
+            return setProperty(name,
+                    getSession().getValueFactory().createValue(value));
         }
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, Node value)
+    public final Property setProperty(final String name, final Node value)
             throws RepositoryException {
         if (value == null) {
             return setProperty(name, (Value) null);
         } else {
-            return setProperty(name, getSession().getValueFactory().createValue(value));
+            return setProperty(name,
+                    getSession().getValueFactory().createValue(value));
         }
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, Binary value)
+    public final Property setProperty(final String name, final Binary value)
             throws RepositoryException {
         if (value == null) {
             return setProperty(name, (Value) null);
@@ -238,7 +250,7 @@
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, BigDecimal value)
+    public final Property setProperty(final String name, final BigDecimal value)
             throws RepositoryException {
         if (value == null) {
             return setProperty(name, (Value) null);
@@ -249,7 +261,7 @@
     }
 
     /** {@inheritDoc} */
-    public Node getNode(String path) throws RepositoryException {
+    public final Node getNode(final String path) throws RepositoryException {
         try {
             return getNode(getSession(), remote.getNode(path));
         } catch (RemoteException ex) {
@@ -258,34 +270,40 @@
     }
 
     /** {@inheritDoc} */
-    public NodeIterator getNodes() throws RepositoryException {
+    public final NodeIterator getNodes() throws RepositoryException {
         try {
-            return getFactory().getNodeIterator(getSession(), remote.getNodes());
+            return getFactory()
+                    .getNodeIterator(getSession(), remote.getNodes());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public NodeIterator getNodes(String pattern) throws RepositoryException {
+    public final NodeIterator getNodes(final String pattern)
+            throws RepositoryException {
         try {
-            return getFactory().getNodeIterator(getSession(), remote.getNodes(pattern));
+            return getFactory()
+                    .getNodeIterator(getSession(), remote.getNodes(pattern));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public NodeIterator getNodes(String[] globs) throws RepositoryException {
+    public final NodeIterator getNodes(final String[] globs)
+            throws RepositoryException {
         try {
-            return getFactory().getNodeIterator(getSession(), remote.getNodes(globs));
+            return getFactory()
+                    .getNodeIterator(getSession(), remote.getNodes(globs));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public Property getProperty(String path) throws RepositoryException {
+    public final Property getProperty(final String path)
+            throws RepositoryException {
         try {
             RemoteProperty property = remote.getProperty(path);
             return getFactory().getProperty(getSession(), property);
@@ -295,36 +313,39 @@
     }
 
     /** {@inheritDoc} */
-    public PropertyIterator getProperties() throws RepositoryException {
+    public final PropertyIterator getProperties() throws RepositoryException {
         try {
-            return getFactory().getPropertyIterator(getSession(), remote.getProperties());
+            return getFactory()
+                    .getPropertyIterator(getSession(), remote.getProperties());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public PropertyIterator getProperties(String pattern)
+    public final PropertyIterator getProperties(final String pattern)
             throws RepositoryException {
         try {
-            return getFactory().getPropertyIterator(getSession(), remote.getProperties(pattern));
+            return getFactory().getPropertyIterator(
+                    getSession(), remote.getProperties(pattern));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public PropertyIterator getProperties(String[] globs)
+    public final PropertyIterator getProperties(final String[] globs)
             throws RepositoryException {
         try {
-            return getFactory().getPropertyIterator(getSession(), remote.getProperties(globs));
+            return getFactory().getPropertyIterator(
+                    getSession(), remote.getProperties(globs));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public Item getPrimaryItem() throws RepositoryException {
+    public final Item getPrimaryItem() throws RepositoryException {
         try {
             return getItem(getSession(), remote.getPrimaryItem());
         } catch (RemoteException ex) {
@@ -333,7 +354,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getIdentifier() throws RepositoryException {
+    public final String getIdentifier() throws RepositoryException {
         try {
             return remote.getIdentifier();
         } catch (RemoteException ex) {
@@ -342,7 +363,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getUUID() throws RepositoryException {
+    public final String getUUID() throws RepositoryException {
         try {
             return remote.getUUID();
         } catch (RemoteException ex) {
@@ -351,7 +372,7 @@
     }
 
     /** {@inheritDoc} */
-    public PropertyIterator getReferences() throws RepositoryException {
+    public final PropertyIterator getReferences() throws RepositoryException {
         try {
             return getFactory().getPropertyIterator(getSession(), remote.getReferences());
         } catch (RemoteException ex) {
@@ -360,7 +381,7 @@
     }
 
     /** {@inheritDoc} */
-    public PropertyIterator getReferences(String name)
+    public final PropertyIterator getReferences(final String name)
             throws RepositoryException {
         try {
             return getFactory().getPropertyIterator(getSession(), remote.getReferences(name));
@@ -370,7 +391,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean hasNode(String path) throws RepositoryException {
+    public final boolean hasNode(final String path) throws RepositoryException {
         try {
             return remote.hasNode(path);
         } catch (RemoteException ex) {
@@ -379,7 +400,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean hasProperty(String path) throws RepositoryException {
+    public final boolean hasProperty(final String path) throws RepositoryException {
         try {
             return remote.hasProperty(path);
         } catch (RemoteException ex) {
@@ -388,7 +409,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean hasNodes() throws RepositoryException {
+    public final boolean hasNodes() throws RepositoryException {
         try {
             return remote.hasNodes();
         } catch (RemoteException ex) {
@@ -397,7 +418,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean hasProperties() throws RepositoryException {
+    public final boolean hasProperties() throws RepositoryException {
         try {
             return remote.hasProperties();
         } catch (RemoteException ex) {
@@ -406,7 +427,7 @@
     }
 
     /** {@inheritDoc} */
-    public NodeType getPrimaryNodeType() throws RepositoryException {
+    public final NodeType getPrimaryNodeType() throws RepositoryException {
         try {
             return getFactory().getNodeType(remote.getPrimaryNodeType());
         } catch (RemoteException ex) {
@@ -415,7 +436,7 @@
     }
 
     /** {@inheritDoc} */
-    public NodeType[] getMixinNodeTypes() throws RepositoryException {
+    public final NodeType[] getMixinNodeTypes() throws RepositoryException {
         try {
             return getNodeTypeArray(remote.getMixinNodeTypes());
         } catch (RemoteException ex) {
@@ -424,7 +445,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isNodeType(String type) throws RepositoryException {
+    public final boolean isNodeType(final String type) throws RepositoryException {
         try {
             return remote.isNodeType(type);
         } catch (RemoteException ex) {
@@ -433,7 +454,7 @@
     }
 
     /** {@inheritDoc} */
-    public void addMixin(String name) throws RepositoryException {
+    public final void addMixin(final String name) throws RepositoryException {
         try {
             remote.addMixin(name);
         } catch (RemoteException ex) {
@@ -442,7 +463,7 @@
     }
 
     /** {@inheritDoc} */
-    public void removeMixin(String name) throws RepositoryException {
+    public final void removeMixin(final String name) throws RepositoryException {
         try {
             remote.removeMixin(name);
         } catch (RemoteException ex) {
@@ -451,7 +472,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean canAddMixin(String name) throws RepositoryException {
+    public final boolean canAddMixin(final String name) throws RepositoryException {
         try {
             return remote.canAddMixin(name);
         } catch (RemoteException ex) {
@@ -460,7 +481,7 @@
     }
 
     /** {@inheritDoc} */
-    public NodeDefinition getDefinition() throws RepositoryException {
+    public final NodeDefinition getDefinition() throws RepositoryException {
         try {
             return getFactory().getNodeDef(remote.getDefinition());
         } catch (RemoteException ex) {
@@ -469,7 +490,7 @@
     }
 
     /** {@inheritDoc} */
-    public Version checkin() throws RepositoryException {
+    public final Version checkin() throws RepositoryException {
         try {
             return getFactory().getVersion(getSession(), remote.checkin());
         } catch (RemoteException ex) {
@@ -478,7 +499,7 @@
     }
 
     /** {@inheritDoc} */
-    public void checkout() throws RepositoryException {
+    public final void checkout() throws RepositoryException {
         try {
             remote.checkout();
         } catch (RemoteException ex) {
@@ -487,7 +508,8 @@
     }
 
     /** {@inheritDoc} */
-    public void update(String workspace) throws RepositoryException {
+    public final void update(final String workspace)
+            throws RepositoryException {
         try {
             remote.update(workspace);
         } catch (RemoteException ex) {
@@ -496,35 +518,38 @@
     }
 
     /** {@inheritDoc} */
-    public NodeIterator merge(String workspace, boolean bestEffort)
-            throws RepositoryException {
+    public final NodeIterator merge(final String workspace,
+            final boolean bestEffort) throws RepositoryException {
         try {
-            return getFactory().getNodeIterator(getSession(), remote.merge(workspace, bestEffort));
+            return getFactory().getNodeIterator(
+                    getSession(), remote.merge(workspace, bestEffort));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public void cancelMerge(Version version) throws RepositoryException {
+    public final void cancelMerge(final Version version)
+            throws RepositoryException {
         try {
-            remote.cancelMerge(version.getUUID());
+            remote.cancelMerge(version.getIdentifier());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public void doneMerge(Version version) throws RepositoryException {
+    public final void doneMerge(final Version version)
+            throws RepositoryException {
         try {
-            remote.doneMerge(version.getUUID());
+            remote.doneMerge(version.getIdentifier());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public String getCorrespondingNodePath(String workspace)
+    public final String getCorrespondingNodePath(final String workspace)
             throws RepositoryException {
         try {
             return remote.getCorrespondingNodePath(workspace);
@@ -534,7 +559,7 @@
     }
 
     /** {@inheritDoc} */
-    public int getIndex() throws RepositoryException {
+    public final int getIndex() throws RepositoryException {
         try {
             return remote.getIndex();
         } catch (RemoteException ex) {
@@ -543,8 +568,8 @@
     }
 
     /** {@inheritDoc} */
-    public void restore(String version, boolean removeExisting)
-            throws RepositoryException {
+    public final void restore(final String version,
+            final boolean removeExisting) throws RepositoryException {
         try {
             remote.restore(version, removeExisting);
         } catch (RemoteException ex) {
@@ -553,28 +578,28 @@
     }
 
     /** {@inheritDoc} */
-    public void restore(Version version, boolean removeExisting)
-            throws RepositoryException {
+    public final void restore(final Version version,
+            final boolean removeExisting) throws RepositoryException {
         try {
-            remote.restoreByUUID(version.getUUID(), removeExisting);
+            remote.restoreByUUID(version.getIdentifier(), removeExisting);
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public void restore(Version version, String path, boolean removeExisting)
-            throws RepositoryException {
+    public final void restore(final Version version, final String path,
+            final boolean removeExisting) throws RepositoryException {
         try {
-            remote.restore(version.getUUID(), path, removeExisting);
+            remote.restore(version.getIdentifier(), path, removeExisting);
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public void restoreByLabel(String label, boolean removeExisting)
-            throws RepositoryException {
+    public final void restoreByLabel(final String label,
+            final boolean removeExisting) throws RepositoryException {
         try {
             remote.restoreByLabel(label, removeExisting);
         } catch (RemoteException ex) {
@@ -583,15 +608,17 @@
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, String[] strings, int type)
-            throws RepositoryException {
+    public final Property setProperty(final String name, final String[] strings,
+            final int type) throws RepositoryException {
         try {
             if (strings == null) {
                 remote.setProperty(name, (Value[]) null);
                 return null;
             } else {
-                Value[] serials = SerialValueFactory.makeSerialValueArray(strings);
-                RemoteProperty property = remote.setProperty(name, serials, type);
+                Value[] serials =
+                        SerialValueFactory.makeSerialValueArray(strings);
+                RemoteProperty property =
+                        remote.setProperty(name, serials, type);
                 return getFactory().getProperty(getSession(), property);
             }
         } catch (RemoteException ex) {
@@ -600,13 +627,15 @@
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, Value[] values, int type)
-            throws RepositoryException {
+    public final Property setProperty(final String name, final Value[] values,
+            final int type) throws RepositoryException {
         try {
+            Value[] serialValues = null;
             if (values != null) {
-                values = SerialValueFactory.makeSerialValueArray(values);
+                serialValues = SerialValueFactory.makeSerialValueArray(values);
             }
-            RemoteProperty property = remote.setProperty(name, values, type);
+            RemoteProperty property =
+                    remote.setProperty(name, serialValues, type);
             if (property != null) {
                 return getFactory().getProperty(getSession(), property);
             } else {
@@ -618,13 +647,15 @@
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, Value value, int type)
-            throws RepositoryException {
+    public final Property setProperty(final String name, final Value value,
+            final int type) throws RepositoryException {
         try {
+            Value serialValue = null;
             if (value != null) {
-                value = SerialValueFactory.makeSerialValue(value);
+                serialValue = SerialValueFactory.makeSerialValue(value);
             }
-            RemoteProperty property = remote.setProperty(name, value, type);
+            RemoteProperty property =
+                    remote.setProperty(name, serialValue, type);
             if (property != null) {
                 return getFactory().getProperty(getSession(), property);
             } else {
@@ -636,8 +667,8 @@
     }
 
     /** {@inheritDoc} */
-    public Property setProperty(String name, String string, int type)
-            throws RepositoryException {
+    public final Property setProperty(final String name, final String string,
+            final int type) throws RepositoryException {
         Value value = null;
         if (string != null) {
             value = getSession().getValueFactory().createValue(string);
@@ -646,7 +677,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isCheckedOut() throws RepositoryException {
+    public final boolean isCheckedOut() throws RepositoryException {
         try {
             return remote.isCheckedOut();
         } catch (RemoteException ex) {
@@ -655,25 +686,27 @@
     }
 
     /** {@inheritDoc} */
-    public VersionHistory getVersionHistory() throws RepositoryException {
+    public final VersionHistory getVersionHistory() throws RepositoryException {
         try {
-            return getFactory().getVersionHistory(getSession(), remote.getVersionHistory());
+            return getFactory().getVersionHistory(
+                    getSession(), remote.getVersionHistory());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public Version getBaseVersion() throws RepositoryException {
+    public final Version getBaseVersion() throws RepositoryException {
         try {
-            return getFactory().getVersion(getSession(), remote.getBaseVersion());
+            return getFactory()
+                    .getVersion(getSession(), remote.getBaseVersion());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public Lock lock(boolean isDeep, boolean isSessionScoped)
+    public final Lock lock(final boolean isDeep, final boolean isSessionScoped)
             throws RepositoryException {
         try {
             RemoteLock lock = remote.lock(isDeep, isSessionScoped);
@@ -684,7 +717,7 @@
     }
 
     /** {@inheritDoc} */
-    public Lock getLock() throws RepositoryException {
+    public final Lock getLock() throws RepositoryException {
         try {
             return getFactory().getLock(getSession(), remote.getLock());
         } catch (RemoteException ex) {
@@ -693,7 +726,7 @@
     }
 
     /** {@inheritDoc} */
-    public void unlock() throws RepositoryException {
+    public final void unlock() throws RepositoryException {
         try {
             remote.unlock();
         } catch (RemoteException ex) {
@@ -702,7 +735,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean holdsLock() throws RepositoryException {
+    public final boolean holdsLock() throws RepositoryException {
         try {
             return remote.holdsLock();
         } catch (RemoteException ex) {
@@ -711,7 +744,7 @@
      }
 
     /** {@inheritDoc} */
-    public boolean isLocked() throws RepositoryException {
+    public final boolean isLocked() throws RepositoryException {
         try {
             return remote.isLocked();
         } catch (RemoteException ex) {
@@ -720,55 +753,59 @@
     }
 
     /** {@inheritDoc} */
-    public void followLifecycleTransition(String transition)
+    public final void followLifecycleTransition(final String transition)
             throws RepositoryException {
         try {
-        	remote.followLifecycleTransition(transition);
+            remote.followLifecycleTransition(transition);
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public String[] getAllowedLifecycleTransistions()
+    public final String[] getAllowedLifecycleTransistions()
             throws RepositoryException {
         try {
-        	return remote.getAllowedLifecycleTransistions();
+            return remote.getAllowedLifecycleTransistions();
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public NodeIterator getSharedSet() throws RepositoryException {
+    public final NodeIterator getSharedSet() throws RepositoryException {
         try {
-            return getFactory().getNodeIterator(getSession(), remote.getSharedSet());
+            return getFactory()
+                    .getNodeIterator(getSession(), remote.getSharedSet());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public PropertyIterator getWeakReferences() throws RepositoryException {
+    public final PropertyIterator getWeakReferences()
+            throws RepositoryException {
         try {
-            return getFactory().getPropertyIterator(getSession(), remote.getWeakReferences());
+            return getFactory().getPropertyIterator(
+                    getSession(), remote.getWeakReferences());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public PropertyIterator getWeakReferences(String name)
+    public final PropertyIterator getWeakReferences(final String name)
             throws RepositoryException {
         try {
-            return getFactory().getPropertyIterator(getSession(), remote.getWeakReferences(name));
+            return getFactory().getPropertyIterator(
+                    getSession(), remote.getWeakReferences(name));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public void removeShare() throws RepositoryException {
+    public final void removeShare() throws RepositoryException {
         try {
             remote.removeShare();
         } catch (RemoteException ex) {
@@ -777,7 +814,7 @@
     }
 
     /** {@inheritDoc} */
-    public void removeSharedSet() throws RepositoryException {
+    public final void removeSharedSet() throws RepositoryException {
         try {
             remote.removeSharedSet();
         } catch (RemoteException ex) {
@@ -786,7 +823,7 @@
     }
 
     /** {@inheritDoc} */
-    public void setPrimaryType(String nodeTypeName)
+    public final void setPrimaryType(final String nodeTypeName)
             throws RepositoryException {
         try {
             remote.setPrimaryType(nodeTypeName);
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java	(working copy)
@@ -19,7 +19,6 @@
 import java.rmi.RemoteException;
 
 import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.nodetype.NodeDefinitionTemplate;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.NodeTypeDefinition;
@@ -28,14 +27,15 @@
 import javax.jcr.nodetype.NodeTypeTemplate;
 import javax.jcr.nodetype.PropertyDefinitionTemplate;
 
+import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeDefinition;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
 
 /**
  * Local adapter for the JCR-RMI
- * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager RemoteNodeTypeManager}
- * interface. This class makes a remote node type manager locally available
- * using the JCR {@link javax.jcr.nodetype.NodeTypeManager NodeTypeManager}
- * interface.
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager
+ * RemoteNodeTypeManager} interface. This class makes a remote node type
+ * manager locally available using the JCR
+ * {@link javax.jcr.nodetype.NodeTypeManager NodeTypeManager} interface.
  *
  * @see javax.jcr.nodetype.NodeTypeManager
  * @see org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager
@@ -53,13 +53,15 @@
      * @param factory local adapter factory
      */
     public ClientNodeTypeManager(
-            RemoteNodeTypeManager remote, LocalAdapterFactory factory) {
+            final RemoteNodeTypeManager remote,
+            final LocalAdapterFactory factory) {
         super(factory);
         this.remote = remote;
     }
 
     /** {@inheritDoc} */
-    public NodeType getNodeType(String name) throws RepositoryException {
+    public final NodeType getNodeType(final String name)
+            throws RepositoryException {
         try {
             return getFactory().getNodeType(remote.getNodeType(name));
         } catch (RemoteException ex) {
@@ -68,7 +70,7 @@
     }
 
     /** {@inheritDoc} */
-    public NodeTypeIterator getAllNodeTypes() throws RepositoryException {
+    public final NodeTypeIterator getAllNodeTypes() throws RepositoryException {
         try {
             return getFactory().getNodeTypeIterator(remote.getAllNodeTypes());
         } catch (RemoteException ex) {
@@ -77,16 +79,19 @@
     }
 
     /** {@inheritDoc} */
-    public NodeTypeIterator getPrimaryNodeTypes() throws RepositoryException {
+    public final NodeTypeIterator getPrimaryNodeTypes()
+            throws RepositoryException {
         try {
-            return getFactory().getNodeTypeIterator(remote.getPrimaryNodeTypes());
+            return getFactory()
+                    .getNodeTypeIterator(remote.getPrimaryNodeTypes());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public NodeTypeIterator getMixinNodeTypes() throws RepositoryException {
+    public final NodeTypeIterator getMixinNodeTypes()
+            throws RepositoryException {
         try {
             return getFactory().getNodeTypeIterator(remote.getMixinNodeTypes());
         } catch (RemoteException ex) {
@@ -94,27 +99,56 @@
         }
     }
 
-    public NodeDefinitionTemplate createNodeDefinitionTemplate()
+    /** {@inheritDoc} */
+    public final NodeDefinitionTemplate createNodeDefinitionTemplate()
             throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCR-3206");
+        try {
+            return getFactory()
+                    .getNodeDefTemp(remote.createNodeDefinitionTemplate());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
-    public NodeTypeTemplate createNodeTypeTemplate()
+    /** {@inheritDoc} */
+    public final NodeTypeTemplate createNodeTypeTemplate()
             throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCR-3206");
+        try {
+            return getFactory()
+                    .getNodeTypeTemp(remote.createNodeTypeTemplate());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
-    public NodeTypeTemplate createNodeTypeTemplate(NodeTypeDefinition ntd)
-            throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCR-3206");
+    /** {@inheritDoc} */
+    public final NodeTypeTemplate createNodeTypeTemplate(
+            final NodeTypeDefinition ntd) throws RepositoryException {
+        try {
+            RemoteNodeTypeDefinition rntd =
+                    (RemoteNodeTypeDefinition) getFactory()
+                    .getRemoteObject(ntd);
+            return getFactory().getNodeTypeTemp(
+                    remote.createNodeTypeTemplate(rntd));
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
-    public PropertyDefinitionTemplate createPropertyDefinitionTemplate()
+    /** {@inheritDoc} */
+    public final PropertyDefinitionTemplate createPropertyDefinitionTemplate()
             throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCR-3206");
+        try {
+            return getFactory().getPropertyDefTemp(
+                    remote.createPropertyDefinitionTemplate());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
-    public boolean hasNodeType(String name) throws RepositoryException {
+    /** {@inheritDoc} */
+    public final boolean hasNodeType(final String name)
+            throws RepositoryException {
         try {
             return remote.hasNodeType(name);
         } catch (RemoteException ex) {
@@ -122,23 +156,51 @@
         }
     }
 
-    public NodeType registerNodeType(
-            NodeTypeDefinition ntd, boolean allowUpdate)
-            throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCR-3206");
+    /** {@inheritDoc} */
+    public final NodeType registerNodeType(final NodeTypeDefinition ntd,
+            final boolean allowUpdate) throws RepositoryException {
+        try {
+            RemoteNodeTypeDefinition rntd =
+                    (RemoteNodeTypeDefinition) getFactory()
+                    .getRemoteObject(ntd);
+            return getFactory().getNodeType(
+                    remote.registerNodeType(rntd, allowUpdate));
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
-    public NodeTypeIterator registerNodeTypes(
-            NodeTypeDefinition[] ntds, boolean allowUpdate)
-            throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCR-3206");
+    /** {@inheritDoc} */
+    public final NodeTypeIterator registerNodeTypes(
+            final NodeTypeDefinition[] ntds, final boolean allowUpdate)
+                    throws RepositoryException {
+        try {
+            RemoteNodeTypeDefinition[] rntds =
+                    new RemoteNodeTypeDefinition[ntds.length];
+            for (int i = 0; i < ntds.length; i++) {
+                rntds[i] = (RemoteNodeTypeDefinition) getFactory()
+                        .getRemoteObject(ntds[i]);
+            }
+            return getFactory().getNodeTypeIterator(
+                    remote.registerNodeTypes(rntds, allowUpdate));
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
-    public void unregisterNodeType(String name) throws RepositoryException {
-        unregisterNodeTypes(new String[] { name });
+    /** {@inheritDoc} */
+    public final void unregisterNodeType(final String name)
+            throws RepositoryException {
+        try {
+            remote.unregisterNodeType(name);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
-    public void unregisterNodeTypes(String[] names) throws RepositoryException {
+    /** {@inheritDoc} */
+    public final void unregisterNodeTypes(final String[] names)
+            throws RepositoryException {
         try {
             remote.unregisterNodeTypes(names);
         } catch (RemoteException ex) {
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientObject.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientObject.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientObject.java	(working copy)
@@ -19,12 +19,16 @@
 import javax.jcr.Item;
 import javax.jcr.Node;
 import javax.jcr.Session;
+import javax.jcr.nodetype.NodeDefinition;
 import javax.jcr.nodetype.NodeType;
+import javax.jcr.nodetype.PropertyDefinition;
 
 import org.apache.jackrabbit.rmi.remote.RemoteItem;
 import org.apache.jackrabbit.rmi.remote.RemoteNode;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
 import org.apache.jackrabbit.rmi.remote.RemoteProperty;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
 import org.apache.jackrabbit.rmi.remote.RemoteVersion;
 import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
 
@@ -45,7 +49,7 @@
      *
      * @param factory local adapter factory
      */
-    protected ClientObject(LocalAdapterFactory factory) {
+    protected ClientObject(final LocalAdapterFactory factory) {
         this.factory = factory;
     }
 
@@ -54,7 +58,7 @@
      *
      * @return local adapter factory
      */
-    protected LocalAdapterFactory getFactory() {
+    protected final LocalAdapterFactory getFactory() {
         return factory;
     }
 
@@ -72,7 +76,8 @@
      * @param remote remote item
      * @return local property, node, or item adapter
      */
-    protected Item getItem(Session session, RemoteItem remote) {
+    protected final Item getItem(
+            final Session session, final RemoteItem remote) {
         if (remote instanceof RemoteProperty) {
             return factory.getProperty(session, (RemoteProperty) remote);
         } else if (remote instanceof RemoteNode) {
@@ -94,11 +99,13 @@
      * @param remote remote node
      * @return local node, version, or version history adapter
      */
-    protected Node getNode(Session session, RemoteNode remote) {
+    protected final Node getNode(
+            final Session session, final RemoteNode remote) {
         if (remote instanceof RemoteVersion) {
             return factory.getVersion(session, (RemoteVersion) remote);
         } else if (remote instanceof RemoteVersionHistory) {
-            return factory.getVersionHistory(session, (RemoteVersionHistory) remote);
+            return factory
+                    .getVersionHistory(session, (RemoteVersionHistory) remote);
         } else {
             return factory.getNode(session, remote);
         }
@@ -114,7 +121,8 @@
      * @param remotes remote node types
      * @return local node type array
      */
-    protected NodeType[] getNodeTypeArray(RemoteNodeType[] remotes) {
+    protected final NodeType[] getNodeTypeArray(
+            final RemoteNodeType[] remotes) {
         if (remotes != null) {
             NodeType[] types = new NodeType[remotes.length];
             for (int i = 0; i < remotes.length; i++) {
@@ -126,4 +134,50 @@
         }
     }
 
+    /**
+     * Utility method for creating an array of local node definition adapters
+     * for an array of remote node definitions. The node definition adapters are
+     * created using the local adapter factory.
+     * <p>
+     * A <code>null</code> input is treated as an empty array.
+     *
+     * @param remotes remote node definitions
+     * @return local node definition array
+     */
+    protected final NodeDefinition[] getNodeDefArray(
+            final RemoteNodeDefinition[] remotes) {
+        if (remotes != null) {
+            NodeDefinition[] defs = new NodeDefinition[remotes.length];
+            for (int i = 0; i < remotes.length; i++) {
+                defs[i] = getFactory().getNodeDef(remotes[i]);
+            }
+            return defs;
+        } else {
+            return new NodeDefinition[0]; // for safety
+        }
+    }
+
+    /**
+     * Utility method for creating an array of local property definition
+     * adapters for an array of remote property definitions. The property
+     * definition adapters are created using the local adapter factory.
+     * <p>
+     * A <code>null</code> input is treated as an empty array.
+     *
+     * @param remotes remote property definitions
+     * @return local property definition array
+     */
+    protected final PropertyDefinition[] getPropertyDefArray(
+            final RemotePropertyDefinition[] remotes) {
+        if (remotes != null) {
+            PropertyDefinition[] defs = new PropertyDefinition[remotes.length];
+            for (int i = 0; i < remotes.length; i++) {
+                defs[i] = getFactory().getPropertyDef(remotes[i]);
+            }
+            return defs;
+        } else {
+            return new PropertyDefinition[0]; // for safety
+        }
+    }
+
 }
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientQuery.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientQuery.java	(revision 1377741)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientQuery.java	(working copy)
@@ -18,9 +18,9 @@
 
 import java.rmi.RemoteException;
 
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.Node;
 import javax.jcr.Value;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryResult;
@@ -38,7 +38,7 @@
  */
 public class ClientQuery extends ClientObject implements Query {
 
-    /** The current session */
+    /** The current session. */
     private Session session;
 
     /** The adapted remote query manager. */
@@ -51,15 +51,15 @@
      * @param remote remote query
      * @param factory adapter factory
      */
-    public ClientQuery(
-            Session session, RemoteQuery remote, LocalAdapterFactory factory) {
+    public ClientQuery(final Session session, final RemoteQuery remote,
+            final LocalAdapterFactory factory) {
         super(factory);
         this.session = session;
         this.remote = remote;
     }
 
     /** {@inheritDoc} */
-    public QueryResult execute() throws RepositoryException {
+    public final QueryResult execute() throws RepositoryException {
         try {
             return getFactory().getQueryResult(session, remote.execute());
         } catch (RemoteException ex) {
@@ -68,7 +68,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getStatement() {
+    public final String getStatement() {
         try {
             return remote.getStatement();
         } catch (RemoteException ex) {
@@ -77,7 +77,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getLanguage() {
+    public final String getLanguage() {
         try {
             return remote.getLanguage();
         } catch (RemoteException ex) {
@@ -86,7 +86,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getStoredQueryPath() throws RepositoryException {
+    public final String getStoredQueryPath() throws RepositoryException {
         try {
             return remote.getStoredQueryPath();
         } catch (RemoteException ex) {
@@ -95,7 +95,8 @@
     }
 
     /** {@inheritDoc} */
-    public Node storeAsNode(String absPath) throws RepositoryException {
+    public final Node storeAsNode(final String absPath)
+            throws RepositoryException {
         try {
             return getNode(session, remote.storeAsNode(absPath));
         } catch (RemoteException ex) {
@@ -104,7 +105,7 @@
     }
 
     /** {@inheritDoc} */
-    public void bindValue(String varName, Value value)
+    public final void bindValue(final String varName, final Value value)
             throws RepositoryException {
         try {
             remote.bindValue(varName, value);
@@ -114,7 +115,7 @@
     }
 
     /** {@inheritDoc} */
-    public String[] getBindVariableNames() throws RepositoryException {
+    public final String[] getBindVariableNames() throws RepositoryException {
         try {
             return remote.getBindVariableNames();
         } catch (RemoteException ex) {
@@ -123,7 +124,7 @@
     }
 
     /** {@inheritDoc} */
-    public void setLimit(long limit) {
+    public final void setLimit(final long limit) {
         try {
             remote.setLimit(limit);
         } catch (RemoteException ex) {
@@ -132,7 +133,7 @@
     }
 
     /** {@inheritDoc} */
-    public void setOffset(long offset) {
+    public final void setOffset(final long offset) {
         try {
             remote.setOffset(offset);
         } catch (RemoteException ex) {
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeDefinition.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeDefinition.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeDefinition.java	(revision 0)
@@ -0,0 +1,134 @@
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeTypeDefinition;
+import javax.jcr.nodetype.PropertyDefinition;
+
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeDefinition;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeTypeDefinition
+ * RemoteNodeTypeDefinition} interface. This class makes a remote node type
+ * definition locally available using the JCR
+ * {@link javax.jcr.nodetype.NodeTypeDefinition NodeTypeDefinition} interface.
+ *
+ * @see javax.jcr.nodetype.NodeTypeDefinition
+ * @see org.apache.jackrabbit.rmi.remote.RemoteNodeTypeDefinition
+ */
+public class ClientNodeTypeDefinition extends ClientObject
+    implements NodeTypeDefinition {
+
+    /** The adapted remote node type definition. */
+    private RemoteNodeTypeDefinition remote;
+
+    /**
+     * Creates a local adapter for the given remote node type definition.
+     *
+     * @param remote remote node type definition
+     * @param factory local adapter factory
+     */
+    protected ClientNodeTypeDefinition(final RemoteNodeTypeDefinition remote,
+            final LocalAdapterFactory factory) {
+        super(factory);
+        this.remote = remote;
+    }
+
+    /** {@inheritDoc} */
+    public final String getName() {
+        try {
+            return remote.getName();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final String[] getDeclaredSupertypeNames() {
+        try {
+            return remote.getDeclaredSupertypeNames();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final boolean isAbstract() {
+        try {
+            return remote.isAbstract();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final boolean isMixin() {
+        try {
+            return remote.isMixin();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final boolean hasOrderableChildNodes() {
+        try {
+            return remote.hasOrderableChildNodes();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final boolean isQueryable() {
+        try {
+            return remote.isQueryable();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final String getPrimaryItemName() {
+        try {
+            return remote.getPrimaryItemName();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final PropertyDefinition[] getDeclaredPropertyDefinitions() {
+        try {
+            RemotePropertyDefinition[] dpds =
+                    remote.getDeclaredPropertyDefinitions();
+            if (dpds == null) {
+                return null;
+            } else {
+                return getPropertyDefArray(dpds);
+            }
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final NodeDefinition[] getDeclaredChildNodeDefinitions() {
+        try {
+            RemoteNodeDefinition[] dcnds = remote
+                    .getDeclaredChildNodeDefinitions();
+            if (dcnds == null) {
+                return null;
+            } else {
+                return getNodeDefArray(dcnds);
+            }
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientObservationManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientObservationManager.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientObservationManager.java	(working copy)
@@ -19,7 +19,6 @@
 import java.rmi.RemoteException;
 
 import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.Workspace;
 import javax.jcr.observation.EventJournal;
 import javax.jcr.observation.EventListener;
@@ -50,13 +49,13 @@
 public class ClientObservationManager extends ClientObject implements
         ObservationManager {
 
-    /** The remote observation manager */
+    /** The remote observation manager. */
     private final RemoteObservationManager remote;
 
     /** The <code>Workspace</code> to which this observation manager belongs. */
     private final Workspace workspace;
 
-    /** The ClientEventPoll class internally used for event dispatching */
+    /** The ClientEventPoll class internally used for event dispatching. */
     private ClientEventPoll poller;
 
     /**
@@ -68,17 +67,18 @@
      * @param workspace The <code>Workspace</code> instance to which this
      *      observation manager belongs.
      */
-    public ClientObservationManager(Workspace workspace,
-            RemoteObservationManager remote) {
+    public ClientObservationManager(final Workspace workspace,
+            final RemoteObservationManager remote) {
         super(null);
         this.remote = remote;
         this.workspace = workspace;
     }
 
     /** {@inheritDoc} */
-    public void addEventListener(EventListener listener, int eventTypes,
-            String absPath, boolean isDeep, String[] uuid,
-            String[] nodeTypeName, boolean noLocal)
+    public final void addEventListener(final EventListener listener,
+            final int eventTypes, final String absPath, final boolean isDeep,
+            final String[] uuid, final String[] nodeTypeName,
+            final boolean noLocal)
             throws RepositoryException {
         try {
             long listenerId = getClientEventPoll().addListener(listener);
@@ -90,7 +90,7 @@
     }
 
     /** {@inheritDoc} */
-    public void removeEventListener(EventListener listener)
+    public final void removeEventListener(final EventListener listener)
             throws RepositoryException {
         try {
             long id = getClientEventPoll().removeListener(listener);
@@ -101,25 +101,45 @@
     }
 
     /** {@inheritDoc} */
-    public EventListenerIterator getRegisteredEventListeners() {
+    public final EventListenerIterator getRegisteredEventListeners() {
         EventListener[] listeners = (poller != null)
                 ? poller.getListeners()
                 : new EventListener[0];
         return new ArrayEventListenerIterator(listeners);
     }
 
-    public EventJournal getEventJournal() throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCR-3206");
+    /** {@inheritDoc} */
+    public final EventJournal getEventJournal() throws RepositoryException {
+        try {
+            return new ClientEventJournal(
+                    remote.getEventJournal(), getFactory());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
-    public EventJournal getEventJournal(
-            int eventTypes, String absPath, boolean isDeep,
-            String[] uuid, String[] nodeTypeName) throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCR-3206");
+    /** {@inheritDoc} */
+    public final EventJournal getEventJournal(final int eventTypes,
+            final String absPath, final boolean isDeep, final String[] uuid,
+            final String[] nodeTypeName) throws RepositoryException {
+        try {
+            return new ClientEventJournal(
+                    remote.getEventJournal(
+                            eventTypes, absPath, isDeep, uuid, nodeTypeName),
+                            getFactory());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
-    public void setUserData(String userData) throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCR-3206");
+    /** {@inheritDoc} */
+    public final void setUserData(final String userData)
+            throws RepositoryException {
+        try {
+            remote.setUserData(userData);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
     }
 
     //---------- internal ------------------------------------------------------
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java	(revision 1376990)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java	(working copy)
@@ -25,9 +25,7 @@
 import javax.jcr.nodetype.NodeTypeIterator;
 import javax.jcr.nodetype.PropertyDefinition;
 
-import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
-import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
 import org.apache.jackrabbit.rmi.value.SerialValueFactory;
 
 /**
@@ -50,58 +48,14 @@
      * @param remote remote node type
      * @param factory local adapter factory
      */
-    public ClientNodeType(RemoteNodeType remote, LocalAdapterFactory factory) {
+    public ClientNodeType(final RemoteNodeType remote,
+            final LocalAdapterFactory factory) {
         super(factory);
         this.remote = remote;
     }
 
-    /**
-     * Utility method for creating an array of local node definition
-     * adapters for an array of remote node definitions. The node
-     * definition adapters are created using the local adapter factory.
-     * <p>
-     * A <code>null</code> input is treated as an empty array.
-     *
-     * @param remotes remote node definitions
-     * @return local node definition array
-     */
-    private NodeDefinition[] getNodeDefArray(RemoteNodeDefinition[] remotes) {
-        if (remotes != null) {
-            NodeDefinition[] defs = new NodeDefinition[remotes.length];
-            for (int i = 0; i < remotes.length; i++) {
-                defs[i] = getFactory().getNodeDef(remotes[i]);
-            }
-            return defs;
-        } else {
-            return new NodeDefinition[0]; // for safety
-        }
-    }
-
-    /**
-     * Utility method for creating an array of local property definition
-     * adapters for an array of remote property definitions. The property
-     * definition adapters are created using the local adapter factory.
-     * <p>
-     * A <code>null</code> input is treated as an empty array.
-     *
-     * @param remotes remote property definitions
-     * @return local property definition array
-     */
-    protected PropertyDefinition[] getPropertyDefArray(
-            RemotePropertyDefinition[] remotes) {
-        if (remotes != null) {
-            PropertyDefinition[] defs = new PropertyDefinition[remotes.length];
-            for (int i = 0; i < remotes.length; i++) {
-                defs[i] = getFactory().getPropertyDef(remotes[i]);
-            }
-            return defs;
-        } else {
-            return new PropertyDefinition[0]; // for safety
-        }
-    }
-
     /** {@inheritDoc} */
-    public String getName() {
+    public final String getName() {
         try {
             return remote.getName();
         } catch (RemoteException ex) {
@@ -110,7 +64,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isMixin() {
+    public final boolean isMixin() {
         try {
             return remote.isMixin();
         } catch (RemoteException ex) {
@@ -119,7 +73,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean hasOrderableChildNodes() {
+    public final boolean hasOrderableChildNodes() {
         try {
             return remote.hasOrderableChildNodes();
         } catch (RemoteException ex) {
@@ -128,7 +82,7 @@
     }
 
     /** {@inheritDoc} */
-    public NodeType[] getSupertypes() {
+    public final NodeType[] getSupertypes() {
         try {
             return getNodeTypeArray(remote.getSupertypes());
         } catch (RemoteException ex) {
@@ -137,7 +91,7 @@
     }
 
     /** {@inheritDoc} */
-    public NodeType[] getDeclaredSupertypes() {
+    public final NodeType[] getDeclaredSupertypes() {
         try {
             return getNodeTypeArray(remote.getDeclaredSupertypes());
         } catch (RemoteException ex) {
@@ -146,7 +100,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isNodeType(String type) {
+    public final boolean isNodeType(final String type) {
         try {
             return remote.isNodeType(type);
         } catch (RemoteException ex) {
@@ -155,7 +109,7 @@
     }
 
     /** {@inheritDoc} */
-    public PropertyDefinition[] getPropertyDefinitions() {
+    public final PropertyDefinition[] getPropertyDefinitions() {
         try {
             return getPropertyDefArray(remote.getPropertyDefs());
         } catch (RemoteException ex) {
@@ -164,7 +118,7 @@
     }
 
     /** {@inheritDoc} */
-    public PropertyDefinition[] getDeclaredPropertyDefinitions() {
+    public final PropertyDefinition[] getDeclaredPropertyDefinitions() {
         try {
             return getPropertyDefArray(remote.getDeclaredPropertyDefs());
         } catch (RemoteException ex) {
@@ -173,7 +127,7 @@
     }
 
     /** {@inheritDoc} */
-    public NodeDefinition[] getChildNodeDefinitions() {
+    public final NodeDefinition[] getChildNodeDefinitions() {
         try {
             return getNodeDefArray(remote.getChildNodeDefs());
         } catch (RemoteException ex) {
@@ -182,7 +136,7 @@
     }
 
     /** {@inheritDoc} */
-    public NodeDefinition[] getDeclaredChildNodeDefinitions() {
+    public final NodeDefinition[] getDeclaredChildNodeDefinitions() {
         try {
             return getNodeDefArray(remote.getDeclaredChildNodeDefs());
         } catch (RemoteException ex) {
@@ -191,7 +145,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean canSetProperty(String name, Value value) {
+    public final boolean canSetProperty(final String name, final Value value) {
         try {
             return remote.canSetProperty(
                     name, SerialValueFactory.makeSerialValue(value));
@@ -203,7 +157,8 @@
     }
 
     /** {@inheritDoc} */
-    public boolean canSetProperty(String name, Value[] values) {
+    public final boolean canSetProperty(
+            final String name, final Value[] values) {
         try {
             Value[] serials = SerialValueFactory.makeSerialValueArray(values);
             return remote.canSetProperty(name, serials);
@@ -215,7 +170,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean canAddChildNode(String name) {
+    public final boolean canAddChildNode(final String name) {
         try {
             return remote.canAddChildNode(name);
         } catch (RemoteException ex) {
@@ -224,7 +179,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean canAddChildNode(String name, String type) {
+    public final boolean canAddChildNode(final String name, final String type) {
         try {
             return remote.canAddChildNode(name, type);
         } catch (RemoteException ex) {
@@ -233,7 +188,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean canRemoveItem(String name) {
+    public final boolean canRemoveItem(final String name) {
         try {
             return remote.canRemoveItem(name);
         } catch (RemoteException ex) {
@@ -242,7 +197,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getPrimaryItemName() {
+    public final String getPrimaryItemName() {
         try {
             return remote.getPrimaryItemName();
         } catch (RemoteException ex) {
@@ -251,7 +206,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean canRemoveNode(String nodeName) {
+    public final boolean canRemoveNode(final String nodeName) {
         try {
             return remote.canRemoveNode(nodeName);
         } catch (RemoteException ex) {
@@ -260,7 +215,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean canRemoveProperty(String propertyName) {
+    public final boolean canRemoveProperty(final String propertyName) {
         try {
             return remote.canRemoveProperty(propertyName);
         } catch (RemoteException ex) {
@@ -269,16 +224,17 @@
     }
 
     /** {@inheritDoc} */
-    public NodeTypeIterator getDeclaredSubtypes() {
+    public final NodeTypeIterator getDeclaredSubtypes() {
         try {
-            return getFactory().getNodeTypeIterator(remote.getDeclaredSubtypes());
+            return getFactory()
+                    .getNodeTypeIterator(remote.getDeclaredSubtypes());
         } catch (RemoteException ex) {
             throw new RemoteRuntimeException(ex);
         }
     }
 
     /** {@inheritDoc} */
-    public NodeTypeIterator getSubtypes() {
+    public final NodeTypeIterator getSubtypes() {
         try {
             return getFactory().getNodeTypeIterator(remote.getSubtypes());
         } catch (RemoteException ex) {
@@ -287,7 +243,7 @@
     }
 
     /** {@inheritDoc} */
-    public String[] getDeclaredSupertypeNames() {
+    public final String[] getDeclaredSupertypeNames() {
         try {
             return remote.getDeclaredSupertypeNames();
         } catch (RemoteException ex) {
@@ -296,7 +252,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isAbstract() {
+    public final boolean isAbstract() {
         try {
             return remote.isAbstract();
         } catch (RemoteException ex) {
@@ -305,7 +261,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isQueryable() {
+    public final boolean isQueryable() {
         try {
             return remote.isQueryable();
         } catch (RemoteException ex) {
Index: src/main/java/org/apache/jackrabbit/rmi/client/SerializableEvent.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/SerializableEvent.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/client/SerializableEvent.java	(revision 0)
@@ -0,0 +1,90 @@
+package org.apache.jackrabbit.rmi.client;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.observation.Event;
+
+/**
+ * Serializable adapter for {@link Event Event} interface.
+ *
+ * @see javax.jcr.observation.Event Event
+ */
+public class SerializableEvent implements Event, Serializable {
+
+    /** The date of this event. */
+    private long date;
+
+    /** The identifier of this event. */
+    private String identifier;
+
+    /** The info of this event. */
+    private Map info;
+
+    /** The path of this event. */
+    private String path;
+
+    /** The type of this event. */
+    private int type;
+
+    /** The user data associated with this event. */
+    private String userData;
+
+    /** The user id associated with this event. */
+    private String userID;
+
+    /**
+     * Creates a serializable event from a JCR event.
+     * @param event a JCR event
+     */
+    public SerializableEvent(final Event event) {
+        try {
+            date = event.getDate();
+            identifier = event.getIdentifier();
+            info = event.getInfo();
+            path = event.getPath();
+            type = event.getType();
+            userData = event.getUserData();
+            userID = event.getUserID();
+        } catch (RepositoryException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public final int getType() {
+        return type;
+    }
+
+    @Override
+    public final String getPath() throws RepositoryException {
+        return path;
+    }
+
+    @Override
+    public final String getUserID() {
+        return userID;
+    }
+
+    @Override
+    public final String getIdentifier() throws RepositoryException {
+        return identifier;
+    }
+
+    @Override
+    public final Map getInfo() throws RepositoryException {
+        return info;
+    }
+
+    @Override
+    public final String getUserData() throws RepositoryException {
+        return userData;
+    }
+
+    @Override
+    public final long getDate() throws RepositoryException {
+        return date;
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/client/SerializablePrincipal.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/SerializablePrincipal.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/client/SerializablePrincipal.java	(revision 0)
@@ -0,0 +1,44 @@
+package org.apache.jackrabbit.rmi.client;
+
+import java.io.Serializable;
+import java.security.Principal;
+
+public class SerializablePrincipal implements Principal, Serializable {
+
+    /** The principal name. */
+    private String name;
+
+    /**
+     * Creates a serializable principal for a given principal.
+     * @param p a principal
+     */
+    public SerializablePrincipal(final Principal p) {
+        name = p.getName();
+    }
+
+    @Override
+    public final String getName() {
+        return name;
+    }
+
+    @Override
+    public final boolean equals(final Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj == null) {
+            return false;
+        }
+
+        if (obj instanceof Principal) {
+            return name.equals(((Principal) obj).getName());
+        }
+
+        return false;
+    }
+
+    @Override
+    public final int hashCode() {
+        return name.hashCode();
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/client/SerializableGroup.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/SerializableGroup.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/client/SerializableGroup.java	(revision 0)
@@ -0,0 +1,75 @@
+package org.apache.jackrabbit.rmi.client;
+
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+
+/**
+ * Serializable adapter for a group.
+ * TODO This implementation has following issues:
+ * <p>
+ * missing implementation of equals() and hashcode()
+ *
+ */
+public class SerializableGroup extends SerializablePrincipal implements Group {
+
+    /** The principals this group contains. */
+    private List<Principal> principals = new ArrayList<Principal>();
+
+    /**
+     * Creates a serializable group for a given group.
+     * @param g a group
+     */
+    public SerializableGroup(final Group g) {
+        super(g);
+        Enumeration<? extends Principal> principals = g.members();
+        while (principals.hasMoreElements()) {
+            Principal principal = principals.nextElement();
+            this.principals.add(createSerializablePrincipal(principal));
+        }
+    }
+
+    @Override
+    public final boolean addMember(final Principal user) {
+        return principals.add(createSerializablePrincipal(user));
+    }
+
+    @Override
+    public final boolean removeMember(final Principal user) {
+        return principals.remove(user);
+    }
+
+    @Override
+    public final boolean isMember(final Principal member) {
+        for (Principal p : principals) {
+            if (p.equals(member)) {
+                return true;
+            } else if (p instanceof Group && ((Group) p).isMember(member)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public final Enumeration<? extends Principal> members() {
+        return Collections.enumeration(principals);
+    }
+
+    /**
+     * Creates a serializable principal/group for any given principal/group.
+     * @param p a principal
+     * @return a serializable principal or group
+     */
+    private static Principal createSerializablePrincipal(final Principal p) {
+        if (p instanceof SerializablePrincipal) {
+            return (SerializablePrincipal) p;
+        } else if (p instanceof Group) {
+            return new SerializableGroup((Group) p);
+        }
+        return new SerializablePrincipal(p);
+    }
+}
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java	(revision 1377741)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java	(working copy)
@@ -16,8 +16,9 @@
  */
 package org.apache.jackrabbit.rmi.client;
 
+import java.rmi.Remote;
 import java.security.Principal;
-import java.util.Iterator;
+import java.security.acl.Group;
 
 import javax.jcr.Item;
 import javax.jcr.NamespaceRegistry;
@@ -32,10 +33,13 @@
 import javax.jcr.lock.LockManager;
 import javax.jcr.nodetype.ItemDefinition;
 import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeDefinitionTemplate;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.NodeTypeIterator;
 import javax.jcr.nodetype.NodeTypeManager;
+import javax.jcr.nodetype.NodeTypeTemplate;
 import javax.jcr.nodetype.PropertyDefinition;
+import javax.jcr.nodetype.PropertyDefinitionTemplate;
 import javax.jcr.observation.ObservationManager;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
@@ -52,14 +56,13 @@
 import javax.jcr.version.VersionIterator;
 import javax.jcr.version.VersionManager;
 
+import org.apache.commons.collections.map.ReferenceIdentityMap;
+import org.apache.commons.collections.map.ReferenceMap;
 import org.apache.jackrabbit.rmi.client.iterator.ClientNodeIterator;
 import org.apache.jackrabbit.rmi.client.iterator.ClientNodeTypeIterator;
 import org.apache.jackrabbit.rmi.client.iterator.ClientPropertyIterator;
 import org.apache.jackrabbit.rmi.client.iterator.ClientRowIterator;
 import org.apache.jackrabbit.rmi.client.iterator.ClientVersionIterator;
-import org.apache.jackrabbit.rmi.client.principal.ClientGroup;
-import org.apache.jackrabbit.rmi.client.principal.ClientPrincipal;
-import org.apache.jackrabbit.rmi.client.principal.ClientPrincipalIterator;
 import org.apache.jackrabbit.rmi.client.security.ClientAccessControlEntry;
 import org.apache.jackrabbit.rmi.client.security.ClientAccessControlList;
 import org.apache.jackrabbit.rmi.client.security.ClientAccessControlManager;
@@ -74,11 +77,14 @@
 import org.apache.jackrabbit.rmi.remote.RemoteNamespaceRegistry;
 import org.apache.jackrabbit.rmi.remote.RemoteNode;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinitionTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteObservationManager;
 import org.apache.jackrabbit.rmi.remote.RemoteProperty;
 import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteQuery;
 import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
 import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
@@ -90,8 +96,6 @@
 import org.apache.jackrabbit.rmi.remote.RemoteVersionManager;
 import org.apache.jackrabbit.rmi.remote.RemoteWorkspace;
 import org.apache.jackrabbit.rmi.remote.RemoteXASession;
-import org.apache.jackrabbit.rmi.remote.principal.RemoteGroup;
-import org.apache.jackrabbit.rmi.remote.principal.RemotePrincipal;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlEntry;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlList;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlManager;
@@ -100,7 +104,8 @@
 
 /**
  * Default implementation of the
- * {@link org.apache.jackrabbit.rmi.client.LocalAdapterFactory LocalAdapterFactory}
+ * {@link org.apache.jackrabbit.rmi.client.LocalAdapterFactory
+ * LocalAdapterFactory}
  * interface. This factory uses the client adapters defined in this
  * package as the default adapter implementations. Subclasses can
  * easily override or extend the default adapters by implementing the
@@ -108,14 +113,27 @@
  */
 public class ClientAdapterFactory implements LocalAdapterFactory {
 
+    /** A cache mapping Client JCR Objects to Remote Stubs. */
+    private ReferenceIdentityMap remoteCache =
+            new ReferenceIdentityMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
+
+    /** A cache mapping Remote Stubs to local Client JCR Objects. */
+    private ReferenceMap localCache =
+            new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
+
     /**
      * Creates and returns a {@link ClientRepository ClientRepository}
      * instance.
      *
      * {@inheritDoc}
      */
-    public Repository getRepository(RemoteRepository remote) {
-        return new ClientRepository(remote, this);
+    public final Repository getRepository(final RemoteRepository remote) {
+        ClientRepository local = (ClientRepository) getClientObject(remote);
+        if (local == null) {
+            local = new ClientRepository(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -125,13 +143,19 @@
      *
      * {@inheritDoc}
      */
-    public Session getSession(Repository repository, RemoteSession remote) {
-        if (remote instanceof RemoteXASession) {
-            return new ClientXASession(
-                    repository, (RemoteXASession) remote, this);
-        } else {
-            return new ClientSession(repository, remote, this);
+    public final Session getSession(final Repository repository,
+            final RemoteSession remote) {
+        ClientSession local = (ClientSession) getClientObject(remote);
+        if (local == null) {
+            if (remote instanceof RemoteXASession) {
+                local = new ClientXASession(repository,
+                        (RemoteXASession) remote, this);
+            } else {
+                local = new ClientSession(repository, remote, this);
+            }
+            addToCache(local, remote);
         }
+        return local;
     }
 
     /**
@@ -139,8 +163,14 @@
      *
      * {@inheritDoc}
      */
-    public Workspace getWorkspace(Session session, RemoteWorkspace remote) {
-        return new ClientWorkspace(session, remote, this);
+    public final Workspace getWorkspace(final Session session,
+            final RemoteWorkspace remote) {
+        ClientWorkspace local = (ClientWorkspace) getClientObject(remote);
+        if (local == null) {
+            local = new ClientWorkspace(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -149,9 +179,15 @@
      *
      * {@inheritDoc}
      */
-    public ObservationManager getObservationManager(Workspace workspace,
-            RemoteObservationManager remote) {
-        return new ClientObservationManager(workspace, remote);
+    public final ObservationManager getObservationManager(
+            final Workspace workspace, final RemoteObservationManager remote) {
+        ClientObservationManager local =
+                (ClientObservationManager) getClientObject(remote);
+        if (local == null) {
+            local = new ClientObservationManager(workspace, remote);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -160,9 +196,15 @@
      *
      * {@inheritDoc}
      */
-    public NamespaceRegistry getNamespaceRegistry(
-            RemoteNamespaceRegistry remote) {
-        return new ClientNamespaceRegistry(remote, this);
+    public final NamespaceRegistry getNamespaceRegistry(
+            final RemoteNamespaceRegistry remote) {
+        ClientNamespaceRegistry local =
+                (ClientNamespaceRegistry) getClientObject(remote);
+        if (local == null) {
+            local = new ClientNamespaceRegistry(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -171,8 +213,15 @@
      *
      * {@inheritDoc}
      */
-    public NodeTypeManager getNodeTypeManager(RemoteNodeTypeManager remote) {
-        return new ClientNodeTypeManager(remote, this);
+    public final NodeTypeManager getNodeTypeManager(
+            final RemoteNodeTypeManager remote) {
+        ClientNodeTypeManager local =
+                (ClientNodeTypeManager) getClientObject(remote);
+        if (local == null) {
+            local = new ClientNodeTypeManager(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -180,8 +229,13 @@
      *
      * {@inheritDoc}
      */
-    public Item getItem(Session session, RemoteItem remote) {
-        return new ClientItem(session, remote, this);
+    public final Item getItem(final Session session, final RemoteItem remote) {
+        ClientItem local = (ClientItem) getClientObject(remote);
+        if (local == null) {
+            local = new ClientItem(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -189,8 +243,14 @@
      *
      * {@inheritDoc}
      */
-    public Property getProperty(Session session, RemoteProperty remote) {
-        return new ClientProperty(session, remote, this);
+    public final Property getProperty(final Session session,
+            final RemoteProperty remote) {
+        ClientProperty local = (ClientProperty) getClientObject(remote);
+        if (local == null) {
+            local = new ClientProperty(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -198,8 +258,13 @@
      *
      * {@inheritDoc}
      */
-    public Node getNode(Session session, RemoteNode remote) {
-        return new ClientNode(session, remote, this);
+    public final Node getNode(final Session session, final RemoteNode remote) {
+        ClientNode local = (ClientNode) getClientObject(remote);
+        if (local == null) {
+            local = new ClientNode(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -207,8 +272,14 @@
      *
      * {@inheritDoc}
      */
-    public Version getVersion(Session session, RemoteVersion remote) {
-        return new ClientVersion(session, remote, this);
+    public final Version getVersion(final Session session,
+            final RemoteVersion remote) {
+        ClientVersion local = (ClientVersion) getClientObject(remote);
+        if (local == null) {
+            local = new ClientVersion(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -217,8 +288,15 @@
      *
      * {@inheritDoc}
      */
-    public VersionHistory getVersionHistory(Session session, RemoteVersionHistory remote) {
-        return new ClientVersionHistory(session, remote, this);
+    public final VersionHistory getVersionHistory(final Session session,
+            final RemoteVersionHistory remote) {
+        ClientVersionHistory local =
+                (ClientVersionHistory) getClientObject(remote);
+        if (local == null) {
+            local = new ClientVersionHistory(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -226,36 +304,62 @@
      *
      * {@inheritDoc}
      */
-    public NodeType getNodeType(RemoteNodeType remote) {
-        return new ClientNodeType(remote, this);
+    public final NodeType getNodeType(final RemoteNodeType remote) {
+        ClientNodeType local = (ClientNodeType) getClientObject(remote);
+        if (local == null) {
+            local = new ClientNodeType(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
-     * Creates and returns a {@link ClientItemDefinition ClientItemDefinition} instance.
+     * Creates and returns a
+     * {@link ClientItemDefinition ClientItemDefinition} instance.
      *
      * {@inheritDoc}
      */
-    public ItemDefinition getItemDef(RemoteItemDefinition remote) {
-        return new ClientItemDefinition(remote, this);
+    public final ItemDefinition getItemDef(final RemoteItemDefinition remote) {
+        ClientItemDefinition local =
+                (ClientItemDefinition) getClientObject(remote);
+        if (local == null) {
+            local = new ClientItemDefinition(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
-     * Creates and returns a {@link ClientNodeDefinition ClientNodeDefinition} instance.
+     * Creates and returns a
+     * {@link ClientNodeDefinition ClientNodeDefinition} instance.
      *
      * {@inheritDoc}
      */
-    public NodeDefinition getNodeDef(RemoteNodeDefinition remote) {
-        return new ClientNodeDefinition(remote, this);
+    public final NodeDefinition getNodeDef(final RemoteNodeDefinition remote) {
+        ClientNodeDefinition local =
+                (ClientNodeDefinition) getClientObject(remote);
+        if (local == null) {
+            local = new ClientNodeDefinition(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
-     * Creates and returns a {@link ClientPropertyDefinition ClientPropertyDefinition}
-     * instance.
+     * Creates and returns a
+     * {@link ClientPropertyDefinition ClientPropertyDefinition} instance.
      *
      * {@inheritDoc}
      */
-    public PropertyDefinition getPropertyDef(RemotePropertyDefinition remote) {
-        return new ClientPropertyDefinition(remote, this);
+    public final PropertyDefinition getPropertyDef(
+            final RemotePropertyDefinition remote) {
+        ClientPropertyDefinition local =
+                (ClientPropertyDefinition) getClientObject(remote);
+        if (local == null) {
+            local = new ClientPropertyDefinition(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -263,18 +367,29 @@
      *
      * {@inheritDoc}
      */
-    public Lock getLock(Session session, RemoteLock remote) {
-        return new ClientLock(session, remote, this);
+    public final Lock getLock(final Session session, final RemoteLock remote) {
+        ClientLock local = (ClientLock) getClientObject(remote);
+        if (local == null) {
+            local = new ClientLock(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
-     * Creates and returns a {@link ClientQueryManager ClientQueryManager} instance.
+     * Creates and returns a
+     * {@link ClientQueryManager ClientQueryManager} instance.
      *
      * {@inheritDoc}
      */
-    public QueryManager getQueryManager(
-            Session session, RemoteQueryManager remote) {
-        return new ClientQueryManager(session, remote, this);
+    public final QueryManager getQueryManager(
+            final Session session, final RemoteQueryManager remote) {
+        ClientQueryManager local = (ClientQueryManager) getClientObject(remote);
+        if (local == null) {
+            local = new ClientQueryManager(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -282,18 +397,30 @@
      *
      * {@inheritDoc}
      */
-    public Query getQuery(Session session, RemoteQuery remote) {
-        return new ClientQuery(session, remote, this);
+    public final Query getQuery(
+            final Session session, final RemoteQuery remote) {
+        ClientQuery local = (ClientQuery) getClientObject(remote);
+        if (local == null) {
+            local = new ClientQuery(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
-     * Creates and returns a {@link ClientQueryResult ClientQueryResult} instance.
+     * Creates and returns a
+     * {@link ClientQueryResult ClientQueryResult} instance.
      *
      * {@inheritDoc}
      */
-    public QueryResult getQueryResult(
-            Session session, RemoteQueryResult remote) {
-        return new ClientQueryResult(session, remote, this);
+    public final QueryResult getQueryResult(
+            final Session session, final RemoteQueryResult remote) {
+        ClientQueryResult local = (ClientQueryResult) getClientObject(remote);
+        if (local == null) {
+            local = new ClientQueryResult(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
@@ -301,16 +428,21 @@
      *
      * {@inheritDoc}
      */
-    public Row getRow(Session session, RemoteRow remote) {
-        return new ClientRow(session, remote, this);
+    public final Row getRow(final Session session, final RemoteRow remote) {
+        ClientRow local = (ClientRow) getClientObject(remote);
+        if (local == null) {
+            local = new ClientRow(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
      * Creates and returns a {@link ClientNodeIterator} instance.
      * {@inheritDoc}
      */
-    public NodeIterator getNodeIterator(
-            Session session, RemoteIterator remote) {
+    public final NodeIterator getNodeIterator(
+            final Session session, final RemoteIterator remote) {
         return new ClientNodeIterator(remote, session, this);
     }
 
@@ -318,8 +450,8 @@
      * Creates and returns a {@link ClientPropertyIterator} instance.
      * {@inheritDoc}
      */
-    public PropertyIterator getPropertyIterator(
-            Session session, RemoteIterator remote) {
+    public final PropertyIterator getPropertyIterator(
+            final Session session, final RemoteIterator remote) {
         return new ClientPropertyIterator(remote, session, this);
     }
 
@@ -327,8 +459,8 @@
      * Creates and returns a {@link ClientVersionIterator} instance.
      * {@inheritDoc}
      */
-    public VersionIterator getVersionIterator(
-            Session session, RemoteIterator remote) {
+    public final VersionIterator getVersionIterator(
+            final Session session, final RemoteIterator remote) {
         return new ClientVersionIterator(remote, session, this);
     }
 
@@ -336,7 +468,8 @@
      * Creates and returns a {@link ClientNodeTypeIterator} instance.
      * {@inheritDoc}
      */
-    public NodeTypeIterator getNodeTypeIterator(RemoteIterator remote) {
+    public final NodeTypeIterator getNodeTypeIterator(
+            final RemoteIterator remote) {
         return new ClientNodeTypeIterator(remote, this);
     }
 
@@ -344,46 +477,92 @@
      * Creates and returns a {@link ClientRowIterator} instance.
      * {@inheritDoc}
      */
-    public RowIterator getRowIterator(Session session, RemoteIterator remote) {
+    public final RowIterator getRowIterator(
+            final Session session, final RemoteIterator remote) {
         return new ClientRowIterator(session, remote, this);
     }
 
-    public LockManager getLockManager(
-            Session session, RemoteLockManager remote) {
-        return new ClientLockManager(session, remote, this);
+    /**
+     * Creates and returns a {@link ClientLockManager ClientLockManager}
+     * instance.
+     * {@inheritDoc}
+     */
+    public final LockManager getLockManager(
+            final Session session, final RemoteLockManager remote) {
+        ClientLockManager local = (ClientLockManager) getClientObject(remote);
+        if (local == null) {
+            local = new ClientLockManager(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
-    public VersionManager getVersionManager(
-            Session session, RemoteVersionManager remote) {
-        return new ClientVersionManager(session, remote, this);
+    /**
+     * Creates and returns a {@link ClientVersionManager ClientVersionManager}
+     * instance.
+     * {@inheritDoc}
+     */
+    public final VersionManager getVersionManager(
+            final Session session, final RemoteVersionManager remote) {
+        ClientVersionManager local =
+                (ClientVersionManager) getClientObject(remote);
+        if (local == null) {
+            local = new ClientVersionManager(session, remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
+     * Creates and returns a
+     * {@link ClientAccessControlManager ClientAccessControlManager}
+     * instance.
      * {@inheritDoc}
      */
-    public AccessControlManager getAccessControlManager(
-            RemoteAccessControlManager remote) {
-        return new ClientAccessControlManager(remote, this);
+    public final AccessControlManager getAccessControlManager(
+            final RemoteAccessControlManager remote) {
+        ClientAccessControlManager local =
+                (ClientAccessControlManager) getClientObject(remote);
+        if (local == null) {
+            local = new ClientAccessControlManager(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
+     * Creates and returns a
+     * {@link ClientAccessControlPolicy ClientAccessControlPolicy}
+     * instance or if remote is an instance of RemoteAccessControlList a
+     * {@link ClientAccessControlList ClientAccessControlList}.
      * {@inheritDoc}
      */
-    public AccessControlPolicy getAccessControlPolicy(
-            RemoteAccessControlPolicy remote) {
-        if (remote instanceof RemoteAccessControlList) {
-            return new ClientAccessControlList(
-                (RemoteAccessControlList) remote, this);
+    public final AccessControlPolicy getAccessControlPolicy(
+            final RemoteAccessControlPolicy remote) {
+        ClientAccessControlPolicy local =
+                (ClientAccessControlPolicy) getClientObject(remote);
+        if (local == null) {
+            if (remote instanceof RemoteAccessControlList) {
+                local = new ClientAccessControlList(
+                        (RemoteAccessControlList) remote, this);
+            } else {
+                local = new ClientAccessControlPolicy(remote, this);
+            }
+            addToCache(local, remote);
         }
-        return new ClientAccessControlPolicy(remote, this);
+        return local;
     }
 
     /**
+     * Creates and returns an array of
+     * {@link ClientAccessControlPolicy ClientAccessControlPolicies}
+     * instance.
      * {@inheritDoc}
      */
-    public AccessControlPolicy[] getAccessControlPolicy(
-            RemoteAccessControlPolicy[] remote) {
-        final AccessControlPolicy[] local = new AccessControlPolicy[remote.length];
+    public final AccessControlPolicy[] getAccessControlPolicy(
+            final RemoteAccessControlPolicy[] remote) {
+        final AccessControlPolicy[] local =
+                new AccessControlPolicy[remote.length];
         for (int i = 0; i < local.length; i++) {
             local[i] = getAccessControlPolicy(remote[i]);
         }
@@ -391,27 +570,44 @@
     }
 
     /**
+     * Creates and returns a
+     * {@link ClientAccessControlPolicyIterator
+     * ClientAccessControlPolicyIterator}
+     * instance.
      * {@inheritDoc}
      */
-    public AccessControlPolicyIterator getAccessControlPolicyIterator(
-            RemoteIterator remote) {
+    public final AccessControlPolicyIterator getAccessControlPolicyIterator(
+            final RemoteIterator remote) {
         return new ClientAccessControlPolicyIterator(remote, this);
     }
 
     /**
+     * Creates and returns a
+     * {@link ClientAccessControlEntry ClientAccessControlEntry}
+     * instance.
      * {@inheritDoc}
      */
-    public AccessControlEntry getAccessControlEntry(
-            RemoteAccessControlEntry remote) {
-        return new ClientAccessControlEntry(remote, this);
+    public final AccessControlEntry getAccessControlEntry(
+            final RemoteAccessControlEntry remote) {
+        ClientAccessControlEntry local =
+                (ClientAccessControlEntry) getClientObject(remote);
+        if (local == null) {
+            local = new ClientAccessControlEntry(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
+     * Creates and returns an array of
+     * {@link ClientAccessControlEntry ClientAccessControlEntries}
+     * instance.
      * {@inheritDoc}
      */
-    public AccessControlEntry[] getAccessControlEntry(
-            RemoteAccessControlEntry[] remote) {
-        final AccessControlEntry[] local = new AccessControlEntry[remote.length];
+    public final AccessControlEntry[] getAccessControlEntry(
+            final RemoteAccessControlEntry[] remote) {
+        final AccessControlEntry[] local =
+                new AccessControlEntry[remote.length];
         for (int i = 0; i < local.length; i++) {
             local[i] = getAccessControlEntry(remote[i]);
         }
@@ -419,39 +615,119 @@
     }
 
     /**
+     * Creates and returns a
+     * {@link SerializablePrincipal SerializablePrincipal}
+     * instance.
+     * {@inheritDoc}
+     */
+    public final SerializablePrincipal getPrincipal(final Principal p) {
+        if (p instanceof SerializablePrincipal) {
+            return (SerializablePrincipal) p;
+        } else if (p instanceof Group) {
+            return new SerializableGroup((Group) p);
+        }
+        return new SerializablePrincipal(p);
+    }
+
+    /**
+     * Creates and returns a
+     * {@link ClientPrivilege ClientPrivilege}
+     * instance.
+     * {@inheritDoc}
+     */
+    public final Privilege getPrivilege(final RemotePrivilege remote) {
+        ClientPrivilege local = (ClientPrivilege) getClientObject(remote);
+        if (local == null) {
+            local = new ClientPrivilege(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
+    }
+
+    /**
+     * Creates and returns an array of
+     * {@link ClientPrivilege ClientPrivileges}
+     * instance.
      * {@inheritDoc}
      */
-    public Principal getPrincipal(RemotePrincipal remote) {
-        if (remote instanceof RemoteGroup) {
-            return new ClientGroup(remote, this);
+    public final Privilege[] getPrivilege(final RemotePrivilege[] remote) {
+        final Privilege[] local = new Privilege[remote.length];
+        for (int i = 0; i < local.length; i++) {
+            local[i] = getPrivilege(remote[i]);
         }
-        return new ClientPrincipal(remote);
+        return local;
     }
 
     /**
+     * Creates and returns a
+     * {@link ClientNodeDefinitionTemplate ClientNodeDefinitionTemplate}
+     * instance.
      * {@inheritDoc}
      */
-    @SuppressWarnings("unchecked")
-    public Iterator<Principal> getPrincipalIterator(RemoteIterator remote) {
-        return new ClientPrincipalIterator(remote, this);
+    public final NodeDefinitionTemplate getNodeDefTemp(
+            final RemoteNodeDefinitionTemplate remote) {
+        ClientNodeDefinitionTemplate local =
+                (ClientNodeDefinitionTemplate) getClientObject(remote);
+        if (local == null) {
+            local = new ClientNodeDefinitionTemplate(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
+     * Creates and returns a
+     * {@link ClientPropertyDefinitionTemplate ClientPropertyDefinitionTemplate}
+     * instance.
      * {@inheritDoc}
      */
-    public Privilege getPrivilege(RemotePrivilege remote) {
-        return new ClientPrivilege(remote, this);
+    public final PropertyDefinitionTemplate getPropertyDefTemp(
+            final RemotePropertyDefinitionTemplate remote) {
+        ClientPropertyDefinitionTemplate local =
+                (ClientPropertyDefinitionTemplate) getClientObject(remote);
+        if (local == null) {
+            local = new ClientPropertyDefinitionTemplate(remote, this);
+            addToCache(local, remote);
+        }
+        return local;
     }
 
     /**
+     * Creates and returns a
+     * {@link ClientNodeTypeTemplate ClientNodeTypeTemplate}
+     * instance.
      * {@inheritDoc}
      */
-    public Privilege[] getPrivilege(RemotePrivilege[] remote) {
-        final Privilege[] local = new Privilege[remote.length];
-        for (int i = 0; i < local.length; i++) {
-            local[i] = getPrivilege(remote[i]);
+    public final NodeTypeTemplate getNodeTypeTemp(
+            final RemoteNodeTypeTemplate remote) {
+        ClientNodeTypeTemplate local =
+                (ClientNodeTypeTemplate) getClientObject(remote);
+        if (local == null) {
+            local = new ClientNodeTypeTemplate(remote, this);
+            addToCache(local, remote);
         }
         return local;
     }
 
+    /** {@inheritDoc} */
+    public final Remote getRemoteObject(final Object clientObject) {
+        return (Remote) remoteCache.get(clientObject);
+    }
+
+    /** {@inheritDoc} */
+    public final Object getClientObject(final Remote stub) {
+        return localCache.get(stub);
+    }
+
+    /**
+     * Convenience method to put remote stubs and jcr objects into the hashmaps.
+     * TODO Check for synchronization needs.
+     * @param jcrObject local JCR object
+     * @param remote remote wrapper of the JCR object
+     */
+    private void addToCache(final Object jcrObject, final Remote remote) {
+        remoteCache.put(jcrObject, remote);
+        localCache.put(remote, jcrObject);
+    }
+
 }
Index: src/main/java/org/apache/jackrabbit/rmi/client/ClientEventJournal.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/ClientEventJournal.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/rmi/client/ClientEventJournal.java	(revision 0)
@@ -0,0 +1,78 @@
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.observation.Event;
+import javax.jcr.observation.EventJournal;
+
+import org.apache.jackrabbit.rmi.client.iterator.ClientIterator;
+import org.apache.jackrabbit.rmi.remote.RemoteEventJournal;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteEventJournal
+ * RemoteEventJournal} interface. This class makes a remote event journal
+ * locally available using the JCR {@link javax.jcr.observation.EventJournal
+ * EventJournal} interface.
+ *
+ * @see javax.jcr.observation.EventJournal
+ * @see org.apache.jackrabbit.rmi.remote.RemoteEventJournal
+ */
+public class ClientEventJournal extends ClientIterator implements EventJournal {
+
+     /** The adapted remote event journal. */
+     private final RemoteEventJournal journal;
+
+    /**
+     * Creates a local adapter for the given remote event journal.
+     *
+     * @param factory local adapter factory
+     * @param remote remote event journal
+     */
+    protected ClientEventJournal(final RemoteEventJournal remote,
+            final LocalAdapterFactory factory) {
+        super(remote, factory);
+        this.journal = remote;
+    }
+
+    /** {@inheritDoc} */
+    public final Event nextEvent() {
+        return (Event) next();
+    }
+
+    /** {@inheritDoc} */
+    public final void skipTo(final long date) {
+        // first try to skip in buffer
+        while (positionInBuffer < buffer.length) {
+            try {
+                if (((Event) buffer[positionInBuffer]).getDate() < date) {
+                    next();
+                }
+            } catch (RepositoryException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        if (buffer == null || positionInBuffer == buffer.length) {
+            try {
+                journal.skipTo(date);
+            } catch (RemoteException ex) {
+                throw new RemoteRuntimeException(ex);
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    public final boolean hasNext() {
+        if (buffer == null) {
+            buffer = new Object[0];
+        }
+        return super.hasNext();
+    }
+
+    /** {@inheritDoc} */
+    protected final Object getObject(final Object remote) {
+        return remote;
+    }
+
+}
Index: src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java
===================================================================
--- src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java	(revision 1377741)
+++ src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java	(working copy)
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.rmi.client;
 
+import java.rmi.Remote;
 import java.security.Principal;
-import java.util.Iterator;
 
 import javax.jcr.Item;
 import javax.jcr.NamespaceRegistry;
@@ -32,10 +32,13 @@
 import javax.jcr.lock.LockManager;
 import javax.jcr.nodetype.ItemDefinition;
 import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeDefinitionTemplate;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.NodeTypeIterator;
 import javax.jcr.nodetype.NodeTypeManager;
+import javax.jcr.nodetype.NodeTypeTemplate;
 import javax.jcr.nodetype.PropertyDefinition;
+import javax.jcr.nodetype.PropertyDefinitionTemplate;
 import javax.jcr.observation.ObservationManager;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
@@ -60,11 +63,14 @@
 import org.apache.jackrabbit.rmi.remote.RemoteNamespaceRegistry;
 import org.apache.jackrabbit.rmi.remote.RemoteNode;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinitionTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteObservationManager;
 import org.apache.jackrabbit.rmi.remote.RemoteProperty;
 import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinitionTemplate;
 import org.apache.jackrabbit.rmi.remote.RemoteQuery;
 import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
 import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
@@ -75,7 +81,6 @@
 import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
 import org.apache.jackrabbit.rmi.remote.RemoteVersionManager;
 import org.apache.jackrabbit.rmi.remote.RemoteWorkspace;
-import org.apache.jackrabbit.rmi.remote.principal.RemotePrincipal;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlEntry;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlManager;
 import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlPolicy;
@@ -204,7 +209,8 @@
      * @param remote remote version history
      * @return local version history adapter
      */
-    VersionHistory getVersionHistory(Session session, RemoteVersionHistory remote);
+    VersionHistory getVersionHistory(
+            Session session, RemoteVersionHistory remote);
 
     /**
      * Factory method for creating a local adapter for a remote node type.
@@ -301,16 +307,19 @@
     NodeIterator getNodeIterator(Session session, RemoteIterator remote);
 
     /**
-     * Factory method for creating a local adapter for a remote property iterator.
+     * Factory method for creating a local adapter for a remote property
+     * iterator.
      *
      * @param session current session
      * @param remote remote property iterator
      * @return local property iterator adapter
      */
-    PropertyIterator getPropertyIterator(Session session, RemoteIterator remote);
+    PropertyIterator getPropertyIterator(
+            Session session, RemoteIterator remote);
 
     /**
-     * Factory method for creating a local adapter for a remote version iterator.
+     * Factory method for creating a local adapter for a remote version
+     * iterator.
      *
      * @param session current session
      * @param remote remote version iterator
@@ -336,14 +345,28 @@
      */
     RowIterator getRowIterator(Session session, RemoteIterator remote);
 
+    /**
+     * Factory method for creating a local adapter for a remote lock manager.
+     *
+     * @param session current session
+     * @param lockManager remote lock manager
+     * @return local row iterator adapter
+     */
     LockManager getLockManager(Session session, RemoteLockManager lockManager);
 
+    /**
+     * Factory method for creating a local adapter for a remote version manager.
+     *
+     * @param session current session
+     * @param versionManager remote version manager
+     * @return local row iterator adapter
+     */
     VersionManager getVersionManager(
             Session session, RemoteVersionManager versionManager);
 
     /**
      * Factory method for creating a local adapter for a remote access control
-     * manager
+     * manager.
      *
      * @param remote remote access control manager
      * @return local access control manager
@@ -353,16 +376,17 @@
 
     /**
      * Factory method for creating a local adapter for a remote access control
-     * policy
+     * policy.
      *
      * @param remote remote access control policy
      * @return local access control policy
      */
-    AccessControlPolicy getAccessControlPolicy(RemoteAccessControlPolicy remote);
+    AccessControlPolicy getAccessControlPolicy(
+            RemoteAccessControlPolicy remote);
 
     /**
      * Factory method for creating an array of local adapter for an array of
-     * remote access control policies
+     * remote access control policies.
      *
      * @param remote array of remote access control policies
      * @return array of local access control policies
@@ -372,7 +396,7 @@
 
     /**
      * Factory method for creating a local adapter for a remote access control
-     * policy iterator
+     * policy iterator.
      *
      * @param remote access control policy iterator
      * @return local access control policy iterator
@@ -382,7 +406,7 @@
 
     /**
      * Factory method for creating a local adapter for a remote access control
-     * entry
+     * entry.
      *
      * @param remote remote access control entry
      * @return local access control entry
@@ -391,42 +415,27 @@
 
     /**
      * Factory method for creating an array of local adapter for an array of
-     * remote access control entry
+     * remote access control entry.
      *
      * @param remote array of remote access control entry
      * @return local array of access control entry
      */
-    AccessControlEntry[] getAccessControlEntry(RemoteAccessControlEntry[] remote);
-
-    /**
-     * Factory method for creating a local adapter for a remote principal.
-     * <p>
-     * If <code>remote</code> is a
-     * {@link org.apache.jackrabbit.rmi.remote.security.RemoteGroup} the
-     * prinicipal returned implements the <code>java.security.acl.Group</code>
-     * interface.
-     *
-     * @param remote principal
-     * @return local principal
-     */
-    Principal getPrincipal(RemotePrincipal remote);
+    AccessControlEntry[] getAccessControlEntry(
+            RemoteAccessControlEntry[] remote);
 
     /**
-     * Factory method for creating a local adapter for a remote principal
-     * iterator.
+     * Factory method for creating a serializable principal.
      * <p>
-     * Each entry in the <code>remote</code> iterator which is a
-     * {@link org.apache.jackrabbit.rmi.remote.security.RemoteGroup} will be
-     * provided as a principal implementing the
-     * <code>java.security.acl.Group</code> interface.
+     * If <code>p</code> is a <code>java.security.acl.Group</code> the principal
+     * returned is a serializable group.
      *
-     * @param remote remote principal iterator
-     * @return local principal iterator
+     * @param p principal
+     * @return a serializable principal
      */
-    Iterator<Principal> getPrincipalIterator(RemoteIterator remote);
+    SerializablePrincipal getPrincipal(Principal p);
 
     /**
-     * Factory method for creating a local adapter for a remote privilege
+     * Factory method for creating a local adapter for a remote privilege.
      *
      * @param remote remote privilege
      * @return local privilege
@@ -435,11 +444,56 @@
 
     /**
      * Factory method for creating an array of local adapter for an array of
-     * remote privilege
+     * remote privilege.
      *
      * @param remote array of remote privilege
      * @return array of local privilege
      */
     Privilege[] getPrivilege(RemotePrivilege[] remote);
 
+    /**
+     * Factory method for creating a local adapter for a remote node definition
+     * template.
+     *
+     * @param remote remote node definition template
+     * @return local node definition template adapter
+     */
+    NodeDefinitionTemplate getNodeDefTemp(
+            RemoteNodeDefinitionTemplate remote);
+
+    /**
+     * Factory method for creating a local adapter for a remote property
+     * definition template.
+     *
+     * @param remote remote property definition template
+     * @return local property definition template adapter
+     */
+    PropertyDefinitionTemplate getPropertyDefTemp(
+            RemotePropertyDefinitionTemplate remote);
+
+    /**
+     * Factory method for creating a local adapter for a remote node type
+     * template.
+     *
+     * @param remote remote node type template
+     * @return local node type template adapter
+     */
+    NodeTypeTemplate getNodeTypeTemp(RemoteNodeTypeTemplate remote);
+
+    /**
+     * Method for getting a remote adapter for a client object from cache.
+     *
+     * @param clientObject a local client object
+     * @return remote stub or <code>null</code>
+     */
+    Remote getRemoteObject(Object clientObject);
+
+    /**
+     * Method for getting a local adapter for a remote object from cache.
+     *
+     * @param stub a remote stub
+     * @return local client object or <code>null</code>
+     */
+    Object getClientObject(Remote stub);
+
 }