diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
index 256ba83850..92623b2f08 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
@@ -628,18 +628,16 @@
             alf_store
     </select>
     
-    <select id="select_StoreRootNodeById" parameterType="Store" resultMap="result_StoreRootNode">
+    <select id="select_StoreByRef" parameterType="Store" resultMap="result_StoreRef">
         select
-            node.id             as id,
-            store.id            as storeId,
-            store.protocol      as storeProtocol,
-            store.identifier    as storeIdentifier,
-            node.uuid           as uuid
+            store.id            as id,
+            store.protocol      as protocol,
+            store.identifier    as identifier
         from
             alf_store store
-            join alf_node node on (store.root_node_id = node.id)
         where
-            store.id = #{id}
+            store.protocol = #{protocol} and
+            store.identifier = #{identifier}
     </select>
     
     <select id="select_StoreRootNodeByRef" parameterType="Store" resultMap="result_StoreRootNode">
diff --git a/config/alfresco/script-services-context.xml b/config/alfresco/script-services-context.xml
index 7d69b68e92..3667b6df9d 100644
--- a/config/alfresco/script-services-context.xml
+++ b/config/alfresco/script-services-context.xml
@@ -228,14 +228,14 @@
         <property name="jsonConversionComponent" ref="jsonConversionComponent" />
     </bean>
 
-	<bean id="baseJsonConversionComponent" abstract="true">
-		<property name="nodeService" ref="NodeService"/>
-		<property name="publicServiceAccessService" ref="PublicServiceAccessService" />
-		<property name="namespaceService" ref="NamespaceService" />
-		<property name="fileFolderService" ref="FileFolderService" />
-		<property name="lockService" ref="LockService" />
-		<property name="permissionService" ref="PermissionService" />	
-		<property name="contentService" ref="ContentService" />
+    <bean id="baseJsonConversionComponent" abstract="true">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="publicServiceAccessService" ref="PublicServiceAccessService" />
+        <property name="namespaceService" ref="NamespaceService" />
+        <property name="fileFolderService" ref="FileFolderService" />
+        <property name="lockService" ref="LockService" />
+        <property name="permissionService" ref="PermissionService" />   
+        <property name="contentService" ref="ContentService" />
         <property name="userPermissions">
             <list>
                 <value>CancelCheckOut</value>
@@ -244,52 +244,50 @@
                 <value>Delete</value>
                 <value>Write</value>
             </list>
-        </property>	
-	</bean>
+        </property> 
+    </bean>
 
-	<bean id="jsonConversionComponent" class="org.alfresco.repo.jscript.app.JSONConversionComponent" parent="baseJsonConversionComponent">
-	</bean>
-	
-	<bean id="baseDecorator" abstract="true" init-method="init">
-		<property name="nodeService" ref="NodeService"/>
-		<property name="namespaceService" ref="NamespaceService"/>
-		<property name="permissionService" ref="PermissionService"/>
-		<property name="jsonConversionComponent" ref="jsonConversionComponent"/>
-	</bean>
-		
+    <bean id="jsonConversionComponent" class="org.alfresco.repo.jscript.app.JSONConversionComponent" parent="baseJsonConversionComponent">
+    </bean>
+    
+    <bean id="baseDecorator" abstract="true" init-method="init">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="namespaceService" ref="NamespaceService"/>
+        <property name="permissionService" ref="PermissionService"/>
+        <property name="jsonConversionComponent" ref="jsonConversionComponent"/>
+    </bean>
+        
     <bean id="usernamePropertiesDecorator" parent="baseDecorator" class="org.alfresco.repo.jscript.app.UsernamePropertyDecorator">
-    	<property name="personService" ref="PersonService" />
-    	<property name="propertyNames">
-    		<set>
-    			<value>cm:creator</value>
-    			<value>cm:modifier</value>
-    			<value>cm:workingCopyOwner</value>
-    			<value>cm:lockOwner</value>
-    			<value>cm:owner</value>
+        <property name="personService" ref="PersonService" />
+        <property name="propertyNames">
+            <set>
+                <value>cm:creator</value>
+                <value>cm:modifier</value>
+                <value>cm:workingCopyOwner</value>
+                <value>cm:lockOwner</value>
+                <value>cm:owner</value>
             <value>qshare:sharedBy</value>
-    		</set>
-   		</property>
+            </set>
+        </property>
     </bean>
     
     <bean id="ignorePropertiesDecorator" parent="baseDecorator" class="org.alfresco.repo.jscript.app.IgnorePropertyDecorator">
-    	<property name="propertyNames">
-    		<set>
-    			<value>cm:content</value>
-    			<value>sys:locale</value>    			
-    			<value>sys:node-uuid</value>
-    			<value>sys:store-protocol</value>
-    			<value>sys:node-dbid</value>
-    			<value>sys:store-identifier</value>
-    		</set>
-   		</property>
+        <property name="propertyNames">
+            <set>
+                <value>cm:content</value>
+                <value>sys:node-uuid</value>
+                <value>sys:store-protocol</value>
+                <value>sys:store-identifier</value>
+            </set>
+        </property>
     </bean>
 
     <bean id="tagPropertyDecorator" parent="baseDecorator" class="org.alfresco.repo.jscript.app.TagPropertyDecorator">
-    	<property name="propertyName" value="cm:taggable" />    
+        <property name="propertyName" value="cm:taggable" />    
     </bean>
     
     <bean id="categoryPropertyDecorator" parent="baseDecorator" class="org.alfresco.repo.jscript.app.CategoryPropertyDecorator">    
-    	<property name="propertyName" value="cm:categories" />    
+        <property name="propertyName" value="cm:categories" />    
     </bean>
 
 </beans>
diff --git a/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml b/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml
index b4ef037096..eb32c6a834 100644
--- a/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml
+++ b/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml
@@ -134,6 +134,19 @@
        
        <property name="scenarios">
             <list>
+               <!--  Mac Finder Drag and Drop -->
+               <bean id="deleteRestoreShuffle" class="org.alfresco.filesys.repo.rules.ScenarioDeleteRestore">
+                    <property name="pattern"><value>.*</value></property>
+                    <property name="timeout"><value>60000</value></property>
+                    <property name="ranking"><value>MEDIUM</value></property>
+                </bean>
+                <!-- Open/Close reference counting -->
+                <bean id="openFileScenario" class="org.alfresco.filesys.repo.rules.ScenarioOpenFile">
+                    <property name="pattern"><value>.*</value></property>
+                    <!-- 20 seconds to open a file -->
+                    <property name="timeout"><value>20000</value></property>
+                    <property name="ranking"><value>HIGH</value></property>
+                </bean>
                 <!-- TextEdit Mac Lion -->
                 <bean id="tempDeleteShuffle" class="org.alfresco.filesys.repo.rules.ScenarioTempDeleteShuffle">
                     <property name="pattern"><value>^.*\.txt$</value></property>
@@ -181,12 +194,7 @@
                 <bean id="simpleNonBufferedScenario" class="org.alfresco.filesys.repo.rules.ScenarioSimpleNonBuffered">
                     <property name="ranking"><value>LOW</value></property>
                 </bean>
-                <bean id="openFileScenario" class="org.alfresco.filesys.repo.rules.ScenarioOpenFile">
-                    <property name="pattern"><value>.*</value></property>
-                    <!-- 20 seconds to open a file -->
-                    <property name="timeout"><value>20000</value></property>
-                    <property name="ranking"><value>HIGH</value></property>
-                </bean>
+
                 <bean id="framemakerFileScenario" class="org.alfresco.filesys.repo.rules.ScenarioDoubleRenameShuffle">
                     <property name="pattern"><value>.*.backup.fm$</value></property>
                     <property name="timeout"><value>60000</value></property>
@@ -298,6 +306,7 @@
       <property name="checkOutCheckInService"><ref bean="CheckoutCheckinService"/></property>
       <property name="ioControlHandler"><ref bean="contentIOHandler"/></property>
       <property name="contentComparator"><ref bean="contentComparator"/></property>
+      <property name="nodeArchiveService" ><ref bean="nodeArchiveService"/></property>
 
    </bean>
 
diff --git a/source/java/org/alfresco/filesys/alfresco/RepositoryDiskInterface.java b/source/java/org/alfresco/filesys/alfresco/RepositoryDiskInterface.java
index ffee3936b0..3e9340c29a 100644
--- a/source/java/org/alfresco/filesys/alfresco/RepositoryDiskInterface.java
+++ b/source/java/org/alfresco/filesys/alfresco/RepositoryDiskInterface.java
@@ -54,6 +54,26 @@ public interface RepositoryDiskInterface
      */
     public NetworkFile createFile(NodeRef rootNode, String Path, long allocationSize) throws IOException;
 
+    /**
+     * RestoreFile.
+     * 
+     * Either restores the file or creates a new one.
+     * 
+     * @param rootNode
+     * @param fromPath - the source node
+     * @param toPath - the target node
+     * @param allocationSize size to allocate for new file
+     * @param originalNodeRef
+     * @throws FileNotFoundException 
+     */
+    public NetworkFile restoreFile(SrvSession sess,
+            TreeConnection tree, 
+            NodeRef rootNode, 
+            String path,
+            long allocationSize, 
+            NodeRef originalNodeRef) throws IOException;
+
+
     /**
      * 
      * @param session // temp until refactor
@@ -76,6 +96,18 @@ public interface RepositoryDiskInterface
      */
     public void closeFile(NodeRef rootNode, String Path, NetworkFile file) throws IOException;
     
+    
+    /**
+     * Delete file
+     * @param session
+     * @param tree
+     * @param rootNode
+     * @param path
+     * @return NodeRef of file deleted or null if no file deleted
+     * @throws IOException
+     */
+    public NodeRef deleteFile2(final SrvSession session, final TreeConnection tree, NodeRef rootNode, String path) throws IOException;
+    
     /**
      * 
      * @param session
diff --git a/source/java/org/alfresco/filesys/repo/CommandExecutorImpl.java b/source/java/org/alfresco/filesys/repo/CommandExecutorImpl.java
index 55207718de..86e8097c1d 100644
--- a/source/java/org/alfresco/filesys/repo/CommandExecutorImpl.java
+++ b/source/java/org/alfresco/filesys/repo/CommandExecutorImpl.java
@@ -21,6 +21,7 @@ import org.alfresco.filesys.repo.rules.commands.ReduceQuotaCommand;
 import org.alfresco.filesys.repo.rules.commands.RemoveNoContentFileOnError;
 import org.alfresco.filesys.repo.rules.commands.RemoveTempFileCommand;
 import org.alfresco.filesys.repo.rules.commands.RenameFileCommand;
+import org.alfresco.filesys.repo.rules.commands.RestoreFileCommand;
 import org.alfresco.filesys.repo.rules.commands.ReturnValueCommand;
 import org.alfresco.jlan.server.SrvSession;
 import org.alfresco.jlan.server.filesys.TreeConnection;
@@ -216,11 +217,17 @@ public class CommandExecutorImpl implements CommandExecutor
                 CreateFileCommand create = (CreateFileCommand)command;
                 return repositoryDiskInterface.createFile(create.getRootNode(), create.getPath(), create.getAllocationSize());
             }
+            else if(command instanceof RestoreFileCommand)
+            {
+                logger.debug("restore file command");
+                RestoreFileCommand restore = (RestoreFileCommand)command;
+                return repositoryDiskInterface.restoreFile(sess, tree, restore.getRootNode(), restore.getPath(), restore.getAllocationSize(), restore.getOriginalNodeRef());
+            }
             else if(command instanceof DeleteFileCommand)
             {
                 logger.debug("delete file command");
                 DeleteFileCommand delete = (DeleteFileCommand)command;
-                diskInterface.deleteFile(sess, tree, delete.getPath());
+                return repositoryDiskInterface.deleteFile2(sess, tree, delete.getRootNode(), delete.getPath());
             }
             else if(command instanceof OpenFileCommand)
             {
diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
index 7148bda4f2..9e5698151d 100644
--- a/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
+++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
@@ -76,6 +76,8 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.content.encoding.ContentCharsetFinder;
 import org.alfresco.repo.content.filestore.FileContentReader;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.node.archive.RestoreNodeReport;
 import org.alfresco.repo.policy.BehaviourFilter;
 import org.alfresco.repo.security.authentication.AuthenticationContext;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -143,6 +145,7 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
     private BehaviourFilter policyBehaviourFilter;
     private NodeMonitorFactory m_nodeMonitorFactory;
     private ContentComparator contentComparator;
+    private NodeArchiveService nodeArchiveService;
 
     // TODO Should not be here - should be specific to a context.
 	private boolean isLockedFilesAsOffline;
@@ -168,6 +171,7 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
         PropertyCheck.mandatory(this, "m_nodeMonitorFactory", m_nodeMonitorFactory);
         PropertyCheck.mandatory(this, "ioControlHandler", ioControlHandler);
         PropertyCheck.mandatory(this, "contentComparator", getContentComparator());
+        PropertyCheck.mandatory(this, "nodeArchiveService", nodeArchiveService);
     }
     
     /**
@@ -1170,6 +1174,11 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
         throw new AlfrescoRuntimeException("obsolete method called");
     }
 
+    public void deleteFile(final SrvSession session, final TreeConnection tree, final String name) throws IOException
+    {
+        throw new AlfrescoRuntimeException("obsolete method called");
+    }
+
     /**
      * Delete the specified file.
      * 
@@ -1177,8 +1186,9 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
      * @param tree Tree connection
      * @param file NetworkFile
      * @exception java.io.IOException The exception description.
+     * @return NodeRef of deletedFile
      */
-    public void deleteFile(final SrvSession session, final TreeConnection tree, final String name) throws IOException
+    public NodeRef deleteFile2(final SrvSession session, final TreeConnection tree, NodeRef rootNode, String path) throws IOException
     {
         // Get the device context
         
@@ -1186,21 +1196,21 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
         
         if(logger.isDebugEnabled())
         {
-            logger.debug("deleteFile:" + name + ", session:" + session.getUniqueId());
+            logger.debug("deleteFile:" + path + ", session:" + session.getUniqueId());
         }
         
         try
         {
             if(session.isPseudoFilesEnabled() && ctx.isPseudoFilesEnabled())
             {
-                String[] paths = FileName.splitPath(name);
+                String[] paths = FileName.splitPath(path);
                 // lookup parent directory
                 NodeRef dirNodeRef = getNodeForPath(tree, paths[0]);
               
                 // Check whether we are opening a pseudo file
                 if(ctx.getPseudoFileOverlay().isPseudoFile(dirNodeRef, paths[1]))
                 {
-                    return;
+                    return null;
                 }
             }
             
@@ -1209,34 +1219,34 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
             final QuotaManager quotaMgr = ctx.getQuotaManager();
 
             // Get the node and delete it
-            final NodeRef nodeRef = getNodeForPath(tree, name);
+            final NodeRef nodeRef = getNodeForPath(tree, path);
                     
             if (fileFolderService.exists(nodeRef))
             {
                 // Get the size of the file being deleted        
-                final FileInfo fInfo = quotaMgr == null ? null : getFileInformation(session, tree, name);
+                final FileInfo fInfo = quotaMgr == null ? null : getFileInformation(session, tree, path);
 
                 if(logger.isDebugEnabled())
                 {
-                    logger.debug("deleted file" + name);
+                    logger.debug("deleted file" + path);
                 }
                 fileFolderService.delete(nodeRef);
                 
                 //TODO Needs to be post-commit
                 if (quotaMgr != null)
                 {
-                    quotaMgr.releaseSpace(session, tree, fInfo.getFileId(), name, fInfo.getSize());
+                    quotaMgr.releaseSpace(session, tree, fInfo.getFileId(), path, fInfo.getSize());
                 }
          
                 // Debug
                     
                 if (logger.isDebugEnabled())
                 {
-                   logger.debug("Deleted file: " + name + ", nodeRef=" + nodeRef);
+                   logger.debug("Deleted file: " + path + ", nodeRef=" + nodeRef);
                 }
 
                 // void return
-                return;
+                return nodeRef;
             }
         }
         catch (NodeLockedException ex)
@@ -1247,7 +1257,7 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
             }
             // Convert to a filesystem access denied status
             
-            throw new AccessDeniedException("Unable to delete " + name);
+            throw new AccessDeniedException("Unable to delete " + path);
         }
         catch (org.alfresco.repo.security.permissions.AccessDeniedException ex)
         {
@@ -1259,7 +1269,7 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
             }
             
             // Convert to a filesystem access denied status
-            throw new AccessDeniedException("Unable to delete " + name);
+            throw new AccessDeniedException("Unable to delete " + path);
         }
         catch (IOException ex)
         {
@@ -1280,10 +1290,11 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
             }
             
             // Convert to a general I/O exception
-            IOException ioe = new IOException("Delete file " + name);
+            IOException ioe = new IOException("Delete file " + path);
             ioe.initCause(ex);
             throw ioe;
         }
+        return null;
     }
 
     /**
@@ -2997,4 +3008,49 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
     {
         return contentComparator;
     }
+
+    @Override
+    public NetworkFile restoreFile(
+            SrvSession sess, 
+            TreeConnection tree, 
+            NodeRef rootNode, 
+            String path,
+            long allocationSize, 
+            NodeRef originalNodeRef) throws IOException
+    {
+        // First attempt to restore the node
+        
+        if(logger.isDebugEnabled())
+        {
+            logger.debug("restore node:" + originalNodeRef + ", path:" + path);
+        }
+        
+        NodeRef archivedNodeRef = getNodeArchiveService().getArchivedNode(originalNodeRef);
+        RestoreNodeReport report = getNodeArchiveService().restoreArchivedNode(archivedNodeRef);
+        
+        if(report.getStatus().isSuccess())
+        {
+            NodeRef newNodeRef = report.getRestoredNodeRef();
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("node has been restored");
+            }
+            
+            return openFile(sess, tree, rootNode, path, OpenFileMode.READ_WRITE, true);
+        }
+        else
+        {
+            return createFile(rootNode, path, allocationSize);
+        }
+    }
+
+    public void setNodeArchiveService(NodeArchiveService nodeArchiveService)
+    {
+        this.nodeArchiveService = nodeArchiveService;
+    }
+
+    public NodeArchiveService getNodeArchiveService()
+    {
+        return nodeArchiveService;
+    }
 }
diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
index 2dfe774517..3c5bb0895e 100644
--- a/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
+++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
@@ -5256,6 +5256,182 @@ public class ContentDiskDriverTest extends TestCase
 
     } // testScenarioMSMacWord20011SaveWithBackup save
     
+    
+    /**
+     * Simulates a Mac Lion Drag and Drop 
+     * 0. ALF-15158.diff  already exists and is versionable
+     * 1. Delete ALF-15158.diff 
+     * 2. Create new document ALF-15158.diff 
+     */
+    public void testMacDragAndDrop() throws Exception
+    {
+        logger.debug("testMacDragAndDrop(");
+        
+        final String FILE_NAME = "ALF-15158.diff";
+        
+        class TestContext
+        {
+            NetworkFile firstFileHandle;
+            NodeRef file1NodeRef;
+        };
+        
+        final String TEST_DIR = TEST_ROOT_DOS_PATH + "\\MacDragAndDrop";
+        
+        ServerConfiguration scfg = new ServerConfiguration("testServer");
+        TestServer testServer = new TestServer("testServer", scfg);
+        final SrvSession testSession = new TestSrvSession(666, testServer, "cifs", "remoteName");
+        DiskSharedDevice share = getDiskSharedDevice();
+        final TreeConnection testConnection = testServer.getTreeConnection(share);
+        final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper();        
+
+        /**
+         * Clean up just in case garbage is left from a previous run
+         */
+        RetryingTransactionCallback<Void> deleteGarbageFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                driver.deleteFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NAME);
+                return null;
+            }
+        };
+     
+        /**
+         * Create a file in the test directory
+         */    
+        
+        try
+        {
+            logger.debug("expect to get exception - cleaning garbage");
+            tran.doInTransaction(deleteGarbageFileCB);
+        }
+        catch (Exception e)
+        {
+            // expect to go here
+        }
+        
+        logger.debug("0) create new file");
+        RetryingTransactionCallback<TestContext> createFileCB = new RetryingTransactionCallback<TestContext>() {
+            @Override
+            public TestContext execute() throws Throwable
+            {
+  
+                TestContext ctx = new TestContext();
+                /**
+                 * Create the test directory we are going to use 
+                 */
+                FileOpenParams createRootDirParams = new FileOpenParams(TEST_ROOT_DOS_PATH, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                FileOpenParams createDirParams = new FileOpenParams(TEST_DIR, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                driver.createDirectory(testSession, testConnection, createRootDirParams);
+                driver.createDirectory(testSession, testConnection, createDirParams);
+                
+                /**
+                 * Create the file we are going to use (FileA.pptx)
+                 */
+                FileOpenParams createFileParams = new FileOpenParams(TEST_DIR + "\\" + FILE_NAME, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                ctx.firstFileHandle = driver.createFile(testSession, testConnection, createFileParams);
+                assertNotNull(ctx.firstFileHandle);
+                
+                driver.closeFile(testSession, testConnection, ctx.firstFileHandle); 
+                
+                ctx.file1NodeRef = getNodeForPath(testConnection, TEST_DIR + "\\" + FILE_NAME);
+                nodeService.addAspect(ctx.file1NodeRef, ContentModel.ASPECT_VERSIONABLE, null);
+                        
+                return ctx;
+            }
+        };
+        final TestContext testContext = tran.doInTransaction(createFileCB, false, true);
+        
+        /**
+         * 1) delete the old file
+         */
+        logger.debug("1) delete old file");
+        RetryingTransactionCallback<Void> renameOldFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                driver.deleteFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NAME);
+                return null;
+            }
+        };
+        tran.doInTransaction(renameOldFileCB, false, true);
+
+             
+        /**
+         * 2) CreateNewFile and write some new content
+         * 
+         */
+        logger.debug("2) write some content");
+        RetryingTransactionCallback<Void> restoreFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                FileOpenParams createFileParams = new FileOpenParams(TEST_DIR + "\\" + FILE_NAME, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                testContext.firstFileHandle = driver.createFile(testSession, testConnection, createFileParams);    
+         
+                ClassPathResource fileResource = new ClassPathResource("filesys/ContentDiskDriverTest3.doc");
+                assertNotNull("unable to find test resource filesys/ContentDiskDriverTest3.doc", fileResource);
+
+                byte[] buffer= new byte[1000];
+                InputStream is = fileResource.getInputStream();
+                try
+                {
+                    long offset = 0;
+                    int i = is.read(buffer, 0, buffer.length);
+                    while(i > 0)
+                    {
+                        testContext.firstFileHandle.writeFile(buffer, i, 0, offset);
+                        offset += i;
+                        i = is.read(buffer, 0, buffer.length);
+                    }                 
+                }
+                finally
+                {
+                    is.close();
+                }
+            
+                driver.closeFile(testSession, testConnection, testContext.firstFileHandle);   
+                    
+                return null;
+            }
+        };
+        tran.doInTransaction(restoreFileCB, false, true);
+        
+                   
+        logger.debug("3) validate results");
+        /**
+         * Now validate everything is correct
+         */
+        RetryingTransactionCallback<Void> validateCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+               NodeRef shuffledNodeRef = getNodeForPath(testConnection, TEST_DIR + "\\" + FILE_NAME);
+               
+               Map<QName, Serializable> props = nodeService.getProperties(shuffledNodeRef);
+               
+               ContentData data = (ContentData)props.get(ContentModel.PROP_CONTENT);
+               assertNotNull("data is null", data);
+               assertEquals("size is wrong", 26112, data.getSize());
+               assertEquals("mimeType is wrong", "application/msword",data.getMimetype());
+               
+               assertTrue("versionable aspect missing", nodeService.hasAspect(shuffledNodeRef, ContentModel.ASPECT_VERSIONABLE));
+               assertTrue("hidden aspect still applied", !nodeService.hasAspect(shuffledNodeRef, ContentModel.ASPECT_HIDDEN));
+               assertTrue("temporary aspect still applied", !nodeService.hasAspect(shuffledNodeRef, ContentModel.ASPECT_TEMPORARY));
+           
+               assertEquals("Node ref has changed", shuffledNodeRef, testContext.file1NodeRef);
+               return null;
+            }
+        };
+        
+        tran.doInTransaction(validateCB, true, true);
+        
+    } // testMacDragAndDrop
+    
     /**
      * Test server
      */
diff --git a/source/java/org/alfresco/filesys/repo/rules/DependentInstance.java b/source/java/org/alfresco/filesys/repo/rules/DependentInstance.java
new file mode 100644
index 0000000000..880a21d7ad
--- /dev/null
+++ b/source/java/org/alfresco/filesys/repo/rules/DependentInstance.java
@@ -0,0 +1,21 @@
+package org.alfresco.filesys.repo.rules;
+
+import java.util.List;
+
+/**
+ * A dependent instance takes account of some other instance.
+ */ 
+public interface DependentInstance
+{
+    /**
+     * Notifies the scenario that there are conflicting loosing scenarios.
+     * <p>
+     * The winning scenario may modify its behavior to take account of the loosers.
+     * <p>
+     * @param results
+     * @param command
+     * @return the new command
+     */
+    Command win(List<ScenarioResult> results, Command command);
+    
+}
diff --git a/source/java/org/alfresco/filesys/repo/rules/RuleEvaluatorImpl.java b/source/java/org/alfresco/filesys/repo/rules/RuleEvaluatorImpl.java
index a2e9a6c16c..fac9c17c8d 100644
--- a/source/java/org/alfresco/filesys/repo/rules/RuleEvaluatorImpl.java
+++ b/source/java/org/alfresco/filesys/repo/rules/RuleEvaluatorImpl.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.alfresco.filesys.repo.rules.ScenarioInstance.Ranking;
+import org.alfresco.filesys.repo.rules.commands.CompoundCommand;
 import org.alfresco.util.PropertyCheck;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -81,6 +82,7 @@ public class RuleEvaluatorImpl implements RuleEvaluator
     /**
      * Evaluate the scenarios against the current operation
      * @param operation the operation to be evaluated
+     * @return the command to execute that operation
      */
     public Command evaluate(EvaluatorContext context, Operation operation)
     {
@@ -88,13 +90,14 @@ public class RuleEvaluatorImpl implements RuleEvaluator
         {
             logger.debug("evaluate:" + operation);
         }
-        
-         
+               
         /**
          * For each scenario, do we need to create a new scenario 
          * instance for the specified operation ?
-         */   
-        // currentScenarioInstances needs to be protected for concurrency.       
+         */
+        List<ScenarioResult> results = new ArrayList<ScenarioResult>(5);
+        
+        // currentScenarioInstances needs to be protected for concurrency.
         synchronized (context.getScenarioInstances())
         {
             for(Scenario scenario : scenarios)
@@ -111,8 +114,6 @@ public class RuleEvaluatorImpl implements RuleEvaluator
              */
             Iterator<ScenarioInstance> i = context.getScenarioInstances().iterator();
 
-            Map<Ranking, Command> executors = new HashMap<Ranking, Command>();
-
             while(i.hasNext())
             {
 
@@ -124,7 +125,8 @@ public class RuleEvaluatorImpl implements RuleEvaluator
                 Command executor = scenario.evaluate(operation);
                 if(executor != null)
                 {
-                    executors.put(scenario.getRanking(), executor);
+                    results.add(new ScenarioResult(scenario, executor));
+
                 }
                 if(scenario.isComplete())
                 {
@@ -136,29 +138,53 @@ public class RuleEvaluatorImpl implements RuleEvaluator
                     i.remove();
                 }
             }
-
-            // HOW to arbitrate between many scenario executors
-            // Idea : Scenarios have rankings.
-            Command ex = executors.get(Ranking.HIGH);
-            if (ex != null) 
-            {
-                logger.debug("returning high priority executor");
-                return ex;
-            }
-            ex = executors.get(Ranking.MEDIUM);
-            if (ex != null) 
-            {
-                logger.debug("returning medium priority executor");
-                return ex;
-            }
-            ex = executors.get(Ranking.LOW);
-            if (ex != null) 
-            {
-                logger.debug("returning low priority executor");
-                return ex;
-            }
+        } // End of syncronized block
+      
+        // results contains the results of the evaluator
+        
+        Map<Ranking, ScenarioResult> executors = new HashMap<Ranking, ScenarioResult>();
+        
+        // HOW to arbitrate between many scenario executors
+        // Idea : Scenarios have rankings.
+        for(ScenarioResult result : results)
+        {
+            executors.put(result.scenario.getRanking(), result);
         }
-
+        
+        ScenarioResult ex = executors.get(Ranking.HIGH);
+        if (ex != null) 
+        {
+            if(ex.scenario instanceof DependentInstance)
+            {
+                DependentInstance di = (DependentInstance)ex.scenario;
+                for(ScenarioResult looser : results)
+                {
+                    if(ex != looser)
+                    {
+                        Command c = di.win(results, ex.command);
+                        logger.debug("returning merged high priority executor");
+                        
+                        return c;
+                    }
+                }
+            }
+                
+            logger.debug("returning high priority executor");
+            return ex.command;
+        }
+        ex = executors.get(Ranking.MEDIUM);
+        if (ex != null) 
+        {
+            logger.debug("returning medium priority executor");
+            return ex.command;
+        }
+        ex = executors.get(Ranking.LOW);
+        if (ex != null) 
+        {
+            logger.debug("returning low priority executor");
+            return ex.command;
+        }
+        
         return null;
     }
 
@@ -179,5 +205,4 @@ public class RuleEvaluatorImpl implements RuleEvaluator
         
         return impl;
     } 
-   
 }
diff --git a/source/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestore.java b/source/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestore.java
new file mode 100644
index 0000000000..ebee4b67f8
--- /dev/null
+++ b/source/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestore.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.filesys.repo.rules;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.alfresco.filesys.repo.rules.ScenarioInstance.Ranking;
+import org.alfresco.filesys.repo.rules.operations.DeleteFileOperation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A delete restore shuffle.
+ * 
+ * Files are deleted then re-created. 
+ */
+public class ScenarioDeleteRestore implements Scenario
+{
+    private static Log logger = LogFactory.getLog(ScenarioDeleteRestore.class);
+   
+    /**
+     * The regex pattern of a create that will trigger a new instance of
+     * the scenario.
+     */    
+    private Pattern pattern;
+    private String strPattern;
+ 
+    private long timeout = 30000;
+    
+    private Ranking ranking = Ranking.HIGH;
+    
+    @Override
+    public ScenarioInstance createInstance(final EvaluatorContext ctx, Operation operation)
+    {
+        /**
+         * This scenario is triggered by a delete of a file matching
+         * the pattern
+         */
+    
+        if(operation instanceof DeleteFileOperation)
+        {
+            DeleteFileOperation c = (DeleteFileOperation)operation;
+            
+            Matcher m = pattern.matcher(c.getName());
+            if(m.matches())
+            {
+                if(logger.isDebugEnabled())
+                {
+                    logger.debug("New Scenario Delete Restore Shuffle Instance:" + c.getName());
+                }
+                
+                ScenarioDeleteRestoreInstance instance = new ScenarioDeleteRestoreInstance() ;
+                instance.setTimeout(timeout);
+                instance.setRanking(ranking);
+                return instance;    
+            }
+        }
+        
+        // No not interested.
+        return null;
+   
+    }
+
+    public void setPattern(String pattern)
+    {
+        this.pattern = Pattern.compile(pattern, Pattern.CASE_INSENSITIVE);
+        this.strPattern = pattern;
+    }
+    
+    public String getPattern()
+    {
+        return this.strPattern;
+    }
+    
+    
+    public void setTimeout(long timeout)
+    {
+        this.timeout = timeout;
+    }
+
+    public long getTimeout()
+    {
+        return timeout;
+    }
+
+    public void setRanking(Ranking ranking)
+    {
+        this.ranking = ranking;
+    }
+
+    public Ranking getRanking()
+    {
+        return ranking;
+    }
+}
diff --git a/source/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestoreInstance.java b/source/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestoreInstance.java
new file mode 100644
index 0000000000..32dc2e35b7
--- /dev/null
+++ b/source/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestoreInstance.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.filesys.repo.rules;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+
+import org.alfresco.filesys.repo.ResultCallback;
+import org.alfresco.filesys.repo.rules.commands.CompoundCommand;
+import org.alfresco.filesys.repo.rules.commands.DeleteFileCommand;
+import org.alfresco.filesys.repo.rules.commands.RestoreFileCommand;
+import org.alfresco.filesys.repo.rules.operations.CreateFileOperation;
+import org.alfresco.filesys.repo.rules.operations.DeleteFileOperation;
+import org.alfresco.jlan.server.filesys.NetworkFile;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * This is an instance of a "delete restore shuffle" 
+ * 
+ * Triggered by a delete of a file followed by a recreate of that same file.
+ * 
+ * <p> First implemented for MacOS Lion Finder.
+ * 
+ * <p>
+ * Sequence of operations.
+ * a) File Deleted
+ * b) File Created.  
+ */
+public class ScenarioDeleteRestoreInstance implements ScenarioInstance
+{
+    private static Log logger = LogFactory.getLog(ScenarioDeleteRestoreInstance.class);
+    
+    enum InternalState 
+    {
+        NONE,
+        LOOKING_FOR_CREATE
+    }
+       
+    InternalState internalState = InternalState.NONE;
+    
+    private Date startTime = new Date();
+    
+    private String deleteName;
+    
+    private NodeRef originalNodeRef;
+    
+    private Ranking ranking;
+    
+    /**
+     * Timeout in ms.  Default 30 seconds.
+     */
+    private long timeout = 60000;
+    
+    private boolean isComplete;
+    
+    /**
+     * Keep track of deletes that we substitute with a rename
+     * could be more than one if scenarios overlap
+     * 
+     * From, TempFileName
+     */
+    private Map<String, String> deletes = new HashMap<String, String>();
+    
+    /**
+     * Evaluate the next operation
+     * @param operation
+     */
+    public Command evaluate(Operation operation)
+    {
+               
+        /**
+         * Anti-pattern : timeout
+         */
+        Date now = new Date();
+        if(now.getTime() > startTime.getTime() + getTimeout())
+        {
+            if(logger.isDebugEnabled())
+            {
+                logger.debug("Instance timed out deleteName:" + deleteName);
+                isComplete = true;
+                return null;
+            }
+        }
+        
+        switch (internalState)
+        {
+        
+        case NONE:
+            
+            /**
+             * Looking for file being deleted deleted 
+
+             */              
+            if(operation instanceof DeleteFileOperation)
+            {
+                DeleteFileOperation d = (DeleteFileOperation)operation;
+                
+                deleteName = d.getName();
+                               
+                if(logger.isDebugEnabled())
+                {
+                    logger.debug("entering LOOKING_FOR_CREATE state: " + deleteName);
+                }
+                internalState = InternalState.LOOKING_FOR_CREATE;
+                
+                ArrayList<Command> commands = new ArrayList<Command>();
+                ArrayList<Command> postCommitCommands = new ArrayList<Command>();
+                ArrayList<Command> postErrorCommands = new ArrayList<Command>();
+                commands.add(new DeleteFileCommand(d.getName(), d.getRootNodeRef(), d.getPath()));
+                postCommitCommands.add(newDeleteFileCallbackCommand());
+                
+                return new CompoundCommand(commands, postCommitCommands, postErrorCommands);  
+                
+            }
+            else
+            {
+                // anything else bomb out
+                if(logger.isDebugEnabled())
+                {
+                    logger.debug("State error, expected a DELETE");
+                }
+                isComplete = true;
+            }
+            break;
+            
+        case LOOKING_FOR_CREATE:
+            
+            /**
+             * Looking for a create operation of the deleted file
+             */
+            if(operation instanceof CreateFileOperation)
+            {
+                CreateFileOperation c = (CreateFileOperation)operation;
+                
+                if(c.getName().equalsIgnoreCase(deleteName))
+                {
+                    isComplete = true;
+                    if(originalNodeRef != null)
+                    {
+                        logger.debug("Scenario fires:" + this);
+                        return new RestoreFileCommand(c.getName(), c.getRootNodeRef(), c.getPath(), c.getAllocationSize(), originalNodeRef);
+                    }
+                    
+                    return null;
+                }
+            }    
+        }
+        
+        return null;
+    }
+    
+    @Override
+    public boolean isComplete()
+    {
+        return isComplete;
+    }
+
+    @Override
+    public Ranking getRanking()
+    {
+        return ranking;
+    }
+    
+    public void setRanking(Ranking ranking)
+    {
+        this.ranking = ranking;
+    }
+    
+    public String toString()
+    {
+        return "ScenarioDeleteRestoreShuffleInstance:" + deleteName;
+    }
+
+    public void setTimeout(long timeout)
+    {
+        this.timeout = timeout;
+    }
+
+    public long getTimeout()
+    {
+        return timeout;
+    }
+    
+    /**
+     * Called for delete file.
+     */
+    private ResultCallback newDeleteFileCallbackCommand()
+    {
+        return new ResultCallback()
+        {
+            @Override
+            public void execute(Object result)
+            {
+                if(result instanceof NodeRef)
+                {
+                    logger.debug("got node ref of deleted node");
+                    originalNodeRef = (NodeRef)result;
+                }
+            }
+
+            @Override
+            public TxnReadState getTransactionRequired()
+            {
+                return TxnReadState.TXN_NONE;
+            }   
+        };
+    }
+
+    
+}
diff --git a/source/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java b/source/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java
index 833a4b639e..04fc80965e 100644
--- a/source/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java
+++ b/source/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java
@@ -20,6 +20,7 @@ package org.alfresco.filesys.repo.rules;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import org.alfresco.filesys.repo.OpenFileMode;
 import org.alfresco.filesys.repo.ResultCallback;
@@ -73,7 +74,7 @@ import org.apache.commons.logging.LogFactory;
  * 4) close
  * 
  */
-class ScenarioOpenFileInstance implements ScenarioInstance
+class ScenarioOpenFileInstance implements ScenarioInstance, DependentInstance
 {
     private static Log logger = LogFactory.getLog(ScenarioOpenFileInstance.class);
       
@@ -538,5 +539,33 @@ class ScenarioOpenFileInstance implements ScenarioInstance
     {
         return (file.getGrantedAccess() == NetworkFile.READONLY);
     }
+
+    /* This openFileInstance knows about ScenarioDeleteRestore */
+    @Override
+    public Command win(List<ScenarioResult> results, Command command)
+    {
+        if(command instanceof CompoundCommand)
+        {
+            CompoundCommand c = (CompoundCommand)command; 
+            for(ScenarioResult looser : results)
+            {
+                if(looser.scenario instanceof ScenarioDeleteRestoreInstance)
+                {
+                    Command l = looser.command; 
+                    ArrayList<Command> commands = new ArrayList<Command>();
+                    ArrayList<Command> postCommitCommands = new ArrayList<Command>();
+                    ArrayList<Command> postErrorCommands = new ArrayList<Command>();
+                    commands.add(l);
+                    postCommitCommands.addAll(c.getPostCommitCommands());
+                    postErrorCommands.addAll(c.getPostErrorCommands());
+                    
+                    logger.debug("returning merged high priority executor");
+                    return new CompoundCommand(commands, postCommitCommands, postErrorCommands);
+                }
+            }
+        }
+        // No change
+        return command;
+    }
 }
 
diff --git a/source/java/org/alfresco/filesys/repo/rules/ScenarioResult.java b/source/java/org/alfresco/filesys/repo/rules/ScenarioResult.java
new file mode 100644
index 0000000000..3b58824495
--- /dev/null
+++ b/source/java/org/alfresco/filesys/repo/rules/ScenarioResult.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.filesys.repo.rules;
+
+public class ScenarioResult
+{
+    public ScenarioResult(ScenarioInstance scenario, Command command)
+    {
+        this.scenario = scenario;
+        this.command = command;
+    }
+    ScenarioInstance scenario;
+    Command command;
+};
+
diff --git a/source/java/org/alfresco/filesys/repo/rules/commands/RestoreFileCommand.java b/source/java/org/alfresco/filesys/repo/rules/commands/RestoreFileCommand.java
new file mode 100644
index 0000000000..65761af42d
--- /dev/null
+++ b/source/java/org/alfresco/filesys/repo/rules/commands/RestoreFileCommand.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * @since 4.1.2
+ */
+package org.alfresco.filesys.repo.rules.commands;
+
+import org.alfresco.filesys.repo.rules.Command;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * Restore File Command
+ */
+public class RestoreFileCommand implements Command
+{
+    private String name;
+    private NodeRef rootNode;
+    private String path;
+    private long allocationSize;
+    private NodeRef originalNodeRef;
+    
+    public RestoreFileCommand(String name, NodeRef rootNode, String path, long allocationSize, NodeRef originalNodeRef)
+    {
+        this.name = name;
+        this.path = path;
+        this.rootNode = rootNode;
+        this.allocationSize = allocationSize;
+        this.originalNodeRef = originalNodeRef;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    
+    public NodeRef getRootNode()
+    {
+        return rootNode;
+    }
+    
+    public String getPath()
+    {
+        return path;
+    }
+    
+    public NodeRef getOriginalNodeRef()
+    {
+        return originalNodeRef;
+    }
+
+    @Override
+    public TxnReadState getTransactionRequired()
+    {
+        return TxnReadState.TXN_READ_WRITE;
+    }
+
+    public void setAllocationSize(long allocationSize)
+    {
+        this.allocationSize = allocationSize;
+    }
+
+    public long getAllocationSize()
+    {
+        return allocationSize;
+    }
+    
+}
diff --git a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
index 87345def21..e28d799107 100644
--- a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
+++ b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
@@ -685,6 +685,11 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
                     continue;
                 }
 
+                if(isFolder && type.getAlfrescoClass().equals(ContentModel.TYPE_SYSTEM_FOLDER))
+                {
+                	continue;
+                }
+
                 // create a child CMIS object
                 ObjectInFolderDataImpl object = new ObjectInFolderDataImpl();
                 CMISNodeInfo ni = createNodeInfo(child.getChildRef());
diff --git a/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java b/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
index 3ec703bf19..1608f60884 100644
--- a/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
+++ b/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
@@ -53,6 +53,12 @@ import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentExcep
 import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisPermissionDeniedException;
 
+/**
+ * CMIS representation of a node.
+ * 
+ * Tries to avoid getting the node's version history where possible (because it's not very performant).
+ * 
+ */
 public class CMISNodeInfoImpl implements CMISNodeInfo
 {
     private static final GregorianCalendar DUMMY_DATE = new GregorianCalendar(2010, 4, 1);
@@ -76,6 +82,10 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
     private Map<String, Serializable> properties;
     private List<CMISNodeInfo> parents;
 
+    public CMISNodeInfoImpl()
+    {
+    }
+    
     public CMISNodeInfoImpl(CMISConnector connector, String objectId)
     {
         this.connector = connector;
@@ -100,6 +110,61 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
         analyseAssociationRef();
     }
 
+    private boolean isCurrentNode()
+    {
+    	return objecVariant != CMISObjectVariant.VERSION;
+    }
+
+    protected void analyseVersionNode(NodeRef nodeRef)
+    {
+        // check version
+        versionHistory = connector.getVersionService().getVersionHistory(nodeRef);
+        if (versionHistory == null)
+        {
+            objecVariant = CMISObjectVariant.CURRENT_VERSION;
+            objectId = nodeRef.toString() + CMISConnector.ID_SEPERATOR + CMISConnector.UNVERSIONED_VERSION_LABEL;
+            versionLabel = CMISConnector.UNVERSIONED_VERSION_LABEL;
+            currentObjectId = objectId;
+        }
+        else
+        {
+            Version headVersion = versionHistory.getHeadVersion();
+
+            versionLabel = (String) connector.getNodeService().getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL);
+            objectId = headVersion.getVersionedNodeRef().toString() + CMISConnector.ID_SEPERATOR + versionLabel;
+            currentObjectId = headVersion.getVersionedNodeRef().toString() + CMISConnector.ID_SEPERATOR
+                    + headVersion.getVersionLabel();
+            currentNodeId = headVersion.getVersionedNodeRef().toString();
+
+            objecVariant = (headVersion.getVersionLabel().equals(versionLabel) ? CMISObjectVariant.CURRENT_VERSION
+                    : CMISObjectVariant.VERSION);
+        }
+    }
+
+    protected void analyseCurrentVersion(NodeRef nodeRef)
+    {
+    	if(connector.getVersionService().isVersioned(nodeRef))
+    	{
+    		versionLabel = (String) connector.getNodeService().getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL);
+    		objectId = nodeRef.toString() + CMISConnector.ID_SEPERATOR + versionLabel;
+    		currentObjectId = nodeRef.toString() + CMISConnector.ID_SEPERATOR + versionLabel;
+    		currentNodeId = nodeRef.toString();
+    		objecVariant = CMISObjectVariant.CURRENT_VERSION;
+    	}
+    	else
+    	{
+    		setUnversioned(nodeRef);
+    	}
+    }
+    
+    protected void setUnversioned(NodeRef nodeRef)
+    {
+        objecVariant = CMISObjectVariant.CURRENT_VERSION;
+        objectId = nodeRef.toString() + CMISConnector.ID_SEPERATOR + CMISConnector.UNVERSIONED_VERSION_LABEL;
+        versionLabel = CMISConnector.UNVERSIONED_VERSION_LABEL;
+        currentObjectId = objectId;    		    	
+    }
+
     protected void analyseObjectId()
     {
         currentNodeId = objectId;
@@ -126,6 +191,7 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
 
             if (NodeRef.isNodeRef(currentNodeId))
             {
+            	// nodeRef is a "live" node, the version label identifies the specific version of the node
                 nodeRef = new NodeRef(currentNodeId);
 
                 // check for existence
@@ -200,10 +266,9 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
                     return;
                 }
 
-                // check version
-                versionHistory = connector.getVersionService().getVersionHistory(nodeRef);
-                if (versionHistory == null)
-                {
+            	if(!connector.getVersionService().isVersioned(nodeRef))
+            	{
+            		// the node isn't versioned
                     if (versionLabel.equals(CMISConnector.UNVERSIONED_VERSION_LABEL))
                     {
                         objecVariant = CMISObjectVariant.CURRENT_VERSION;
@@ -212,29 +277,52 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
                     {
                         objecVariant = CMISObjectVariant.NOT_EXISTING;
                     }
-
-                    return;
-                }
-
-                try
-                {
-                    currentObjectId = currentNodeId + CMISConnector.ID_SEPERATOR
-                            + versionHistory.getHeadVersion().getVersionLabel();
-
-                    version = versionHistory.getVersion(versionLabel);
-
-                    if (versionLabel.equals(versionHistory.getHeadVersion().getVersionLabel()))
-                    {
-                        objecVariant = CMISObjectVariant.CURRENT_VERSION;
-                    } else
-                    {
-                        nodeRef = version.getFrozenStateNodeRef();
-                        objecVariant = CMISObjectVariant.VERSION;
-                    }
-                } catch (VersionDoesNotExistException e)
-                {
-                    objecVariant = CMISObjectVariant.NOT_EXISTING;
-                }
+            	}
+            	else
+            	{
+            		// the node is versioned, determine whether the versionLabel refers to the head version or a
+            		// specific non-head version
+	            	String headVersionLabel = (String)connector.getNodeService().getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL);
+	                currentObjectId = currentNodeId + CMISConnector.ID_SEPERATOR + headVersionLabel;
+	
+	                if (versionLabel.equals(headVersionLabel))
+	                {
+	                	// the version label refers to the current head version
+	                    objecVariant = CMISObjectVariant.CURRENT_VERSION;
+	                }
+	                else
+	                {
+	                	// the version label refers to a specific non-head version, find the nodeRef
+	                	// of the version node from the version history
+	                    versionHistory = connector.getVersionService().getVersionHistory(nodeRef);
+	                    if (versionHistory == null)
+	                    {
+	                    	// unexpected null versionHistory, assume not versioned
+	                        if (versionLabel.equals(CMISConnector.UNVERSIONED_VERSION_LABEL))
+	                        {
+	                            objecVariant = CMISObjectVariant.CURRENT_VERSION;
+	
+	                        }
+	                        else
+	                        {
+	                            objecVariant = CMISObjectVariant.NOT_EXISTING;
+	                        }
+	                    }
+	                    else
+	                    {
+		                    try
+		                    {
+		        	            version = versionHistory.getVersion(versionLabel);
+		        	            nodeRef = version.getFrozenStateNodeRef();
+		        	            objecVariant = CMISObjectVariant.VERSION;
+		                    }
+		                    catch (VersionDoesNotExistException e)
+		                    {
+		                        objecVariant = CMISObjectVariant.NOT_EXISTING;
+		                    }
+	                    }
+	                }
+            	}
 
                 // check if checked out
                 hasPWC = connector.getCheckOutCheckInService().isCheckedOut(getCurrentNodeNodeRef());
@@ -323,26 +411,13 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
         }
 
         // check version
-        versionHistory = connector.getVersionService().getVersionHistory(nodeRef);
-        if (versionHistory == null)
+        if(connector.getVersionService().isAVersion(nodeRef))
         {
-            objecVariant = CMISObjectVariant.CURRENT_VERSION;
-            objectId = nodeRef.toString() + CMISConnector.ID_SEPERATOR + CMISConnector.UNVERSIONED_VERSION_LABEL;
-            versionLabel = CMISConnector.UNVERSIONED_VERSION_LABEL;
-            currentObjectId = objectId;
+        	analyseVersionNode(nodeRef);
         }
         else
         {
-            Version headVersion = versionHistory.getHeadVersion();
-
-            versionLabel = (String) connector.getNodeService().getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL);
-            objectId = headVersion.getVersionedNodeRef().toString() + CMISConnector.ID_SEPERATOR + versionLabel;
-            currentObjectId = headVersion.getVersionedNodeRef().toString() + CMISConnector.ID_SEPERATOR
-                    + headVersion.getVersionLabel();
-            currentNodeId = headVersion.getVersionedNodeRef().toString();
-
-            objecVariant = (headVersion.getVersionLabel().equals(versionLabel) ? CMISObjectVariant.CURRENT_VERSION
-                    : CMISObjectVariant.VERSION);
+        	analyseCurrentVersion(nodeRef);
         }
 
         hasPWC = connector.getCheckOutCheckInService().isCheckedOut(nodeRef);
@@ -450,30 +525,37 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
     {
         if (isLatestMajorVersion == null)
         {
-            isLatestMajorVersion = Boolean.FALSE;
+        	isLatestMajorVersion = Boolean.FALSE;
             if (!isPWC())
             {
-                VersionHistory versionHistory = getVersionHistory();
-                if (versionHistory == null)
-                {
-                    isLatestMajorVersion = Boolean.TRUE;
-                } else
-                {
-                    Version currentVersion = versionHistory.getHeadVersion();
-                    while (currentVersion != null)
-                    {
-                        if (currentVersion.getVersionType() == VersionType.MAJOR)
-                        {
-                        	// ALF-11116: the current node (in the main store) and the frozen node (in the version store) are both represented as CMISNodeInfos
-                        	// but are indistinguishable apart from their storeRef (their objectVariant can be the same).
-                            isLatestMajorVersion = (nodeRef.getStoreRef().getIdentifier().equals(Version2Model.STORE_ID) || nodeRef.getStoreRef().getIdentifier().equals(VersionModel.STORE_ID)) ?
-                            		currentVersion.getFrozenStateNodeRef().equals(nodeRef) : currentVersion.getVersionedNodeRef().equals(nodeRef);
-                            break;
-                        }
-                        currentVersion = versionHistory.getPredecessor(currentVersion);
-                    }
-                }
-            }
+	        	if(isCurrentNode())
+    	    	{
+	        		isLatestMajorVersion = Boolean.TRUE;
+        		}
+        		else
+        		{
+	                VersionHistory versionHistory = getVersionHistory();
+	                if (versionHistory == null)
+	                {
+	                    isLatestMajorVersion = Boolean.TRUE;
+	                } else
+	                {
+	                    Version currentVersion = versionHistory.getHeadVersion();
+	                    while (currentVersion != null)
+	                    {
+	                        if (currentVersion.getVersionType() == VersionType.MAJOR)
+	                        {
+	                        	// ALF-11116: the current node (in the main store) and the frozen node (in the version store) are both represented as CMISNodeInfos
+	                        	// but are indistinguishable apart from their storeRef (their objectVariant can be the same).
+	                            isLatestMajorVersion = (nodeRef.getStoreRef().getIdentifier().equals(Version2Model.STORE_ID) || nodeRef.getStoreRef().getIdentifier().equals(VersionModel.STORE_ID)) ?
+	                            		currentVersion.getFrozenStateNodeRef().equals(nodeRef) : currentVersion.getVersionedNodeRef().equals(nodeRef);
+	                            break;
+	                        }
+	                        currentVersion = versionHistory.getPredecessor(currentVersion);
+	                    }
+	                }
+	            }
+        	}
         }
 
         return isLatestMajorVersion.booleanValue();
@@ -730,6 +812,7 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
         }
     }
 
+    // TODO lock here??
     public VersionHistory getVersionHistory()
     {
         if (versionHistory == null && isDocument())
@@ -744,8 +827,28 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
 
         return versionHistory;
     }
+    
+    public void deleteNode()
+    {
+        Version version = getVersion();
 
-    public Version getVersion()
+        if (getVersionHistory().getPredecessor(version) == null)
+        {
+            connector.getNodeService().deleteNode(nodeRef);
+        }
+        else
+        {
+            connector.getVersionService().deleteVersion(nodeRef, version);
+        }
+    }
+
+    public void deleteVersion()
+    {
+        Version version = getVersion();
+        connector.getVersionService().deleteVersion(nodeRef, version);
+    }
+
+    protected Version getVersion()
     {
         if (version == null && isDocument())
         {
diff --git a/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java b/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java
index a49c7ddba1..a83b549317 100644
--- a/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java
+++ b/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java
@@ -70,6 +70,7 @@ public class OpenCmisLocalTest extends TestCase
         @Override
         public void init(Map<String, String> parameters)
         {
+        	serviceFactory.init(parameters);
         }
 
         @Override
diff --git a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
index 10e0a36f8a..5bb6094917 100644
--- a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
@@ -691,6 +691,21 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
      * Stores
      */
 
+    @Override
+    public Pair<Long, StoreRef> getStore(StoreRef storeRef)
+    {
+        StoreEntity store = selectStore(storeRef);
+        if (store == null)
+        {
+            return null;
+        }
+        else
+        {
+            return new Pair<Long, StoreRef>(store.getId(), store.getStoreRef());
+        }
+    }
+
+    @Override
     public List<Pair<Long, StoreRef>> getStores()
     {
         List<StoreEntity> storeEntities = selectAllStores();
@@ -4598,7 +4613,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
     protected abstract int updateTransaction(Long txnId, Long commit_time_ms);
     protected abstract int deleteTransaction(Long txnId);
     protected abstract List<StoreEntity> selectAllStores();
-    protected abstract NodeEntity selectStoreRootNode(Long storeId);
+    protected abstract StoreEntity selectStore(StoreRef storeRef);
     protected abstract NodeEntity selectStoreRootNode(StoreRef storeRef);
     protected abstract Long insertStore(StoreEntity store);
     protected abstract int updateStoreRoot(StoreEntity store);
diff --git a/source/java/org/alfresco/repo/domain/node/NodeDAO.java b/source/java/org/alfresco/repo/domain/node/NodeDAO.java
index 0cbade3c33..022faea554 100644
--- a/source/java/org/alfresco/repo/domain/node/NodeDAO.java
+++ b/source/java/org/alfresco/repo/domain/node/NodeDAO.java
@@ -82,6 +82,13 @@ public interface NodeDAO extends NodeBulkLoader
      * Store
      */
     
+    /**
+     * Get the ID-ref pair for a store
+     * 
+     * @return                  Returns the ID-reference pair for the store or <tt>null</tt> if it doesn't exist
+     */
+    public Pair<Long, StoreRef> getStore(StoreRef storeRef);
+    
     /**
      * Fetch a list of all stores in the repository
      * 
diff --git a/source/java/org/alfresco/repo/domain/node/NodeDAOTest.java b/source/java/org/alfresco/repo/domain/node/NodeDAOTest.java
index 19e2a96299..478af8f55e 100644
--- a/source/java/org/alfresco/repo/domain/node/NodeDAOTest.java
+++ b/source/java/org/alfresco/repo/domain/node/NodeDAOTest.java
@@ -29,6 +29,7 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.Pair;
@@ -115,4 +116,18 @@ public class NodeDAOTest extends TestCase
         List<NodeIdAndAclId> acls = nodeDAO.getPrimaryChildrenAcls(1L);
         assertNotNull("Null list", acls);
     }
+    
+    public void testGetStoreId() throws Throwable
+    {
+        // Get all stores
+        List<Pair<Long, StoreRef>> storePairs = nodeDAO.getStores();
+        // Check each one
+        for (Pair<Long, StoreRef> storePair : storePairs)
+        {
+            StoreRef storeRef = storePair.getSecond();
+            // Check
+            Pair<Long, StoreRef> checkStorePair = nodeDAO.getStore(storeRef);
+            assertEquals("Store pair did not match. ", storePair, checkStorePair);
+        }
+    }
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
index b846608adb..4aa47fba10 100644
--- a/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
@@ -82,7 +82,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
     private static final String UPDATE_STORE_ROOT = "alfresco.node.update_StoreRoot";
     private static final String UPDATE_STORE = "alfresco.node.update_Store";
     private static final String SELECT_STORE_ALL = "alfresco.node.select_StoreAll";
-    private static final String SELECT_STORE_ROOT_NODE_BY_ID = "alfresco.node.select_StoreRootNodeById";
+    private static final String SELECT_STORE_BY_REF = "alfresco.node.select_StoreByRef";
     private static final String SELECT_STORE_ROOT_NODE_BY_REF = "alfresco.node.select_StoreRootNodeByRef";
     private static final String INSERT_NODE = "alfresco.node.insert.insert_Node";
     private static final String UPDATE_NODE = "alfresco.node.update_Node";
@@ -272,11 +272,12 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
     }
 
     @Override
-    protected NodeEntity selectStoreRootNode(Long storeId)
+    protected StoreEntity selectStore(StoreRef storeRef)
     {
         StoreEntity store = new StoreEntity();
-        store.setId(storeId);
-        return (NodeEntity) template.selectOne(SELECT_STORE_ROOT_NODE_BY_ID, store);
+        store.setProtocol(storeRef.getProtocol());
+        store.setIdentifier(storeRef.getIdentifier());
+        return (StoreEntity) template.selectOne(SELECT_STORE_BY_REF, store);
     }
 
     @Override
diff --git a/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java b/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java
index c672f79e70..b6adedc689 100644
--- a/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java
+++ b/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java
@@ -196,10 +196,12 @@ public class RemoteConnectorServiceImpl implements RemoteConnectorService
             // Server side exceptions
             if (status >= 500 && status <= 599)
             {
+                logger.error("executeRequest: remote connector server exception: ["+status+"] "+statusText);
                 throw new RemoteConnectorServerException(status, statusText);
             }
             if(status == Status.STATUS_PRECONDITION_FAILED)
             {
+                logger.error("executeRequest: remote connector client exception: ["+status+"] "+statusText);
                 throw new RemoteConnectorClientException(status, statusText, response);
             }
             else
@@ -208,16 +210,18 @@ public class RemoteConnectorServiceImpl implements RemoteConnectorService
                 if (httpRequest != null)
                 {
                     // Response wasn't too big and is available, supply it
+                    logger.error("executeRequest: remote connector client exception: ["+status+"] "+statusText);
                     throw new RemoteConnectorClientException(status, statusText, response);
                 }
                 else
                 {
                     // Response was too large, report without it
+                    logger.error("executeRequest: remote connector client exception: ["+status+"] "+statusText);
                     throw new RemoteConnectorClientException(status, statusText, null);
                 }
             }
         }
-
+        
         // If we get here, then the request/response was all fine
         // So, return our created response
         return response;
diff --git a/source/java/org/alfresco/repo/version/Version2ServiceImpl.java b/source/java/org/alfresco/repo/version/Version2ServiceImpl.java
index 3c72676ce7..48ae441c5f 100644
--- a/source/java/org/alfresco/repo/version/Version2ServiceImpl.java
+++ b/source/java/org/alfresco/repo/version/Version2ServiceImpl.java
@@ -31,13 +31,12 @@ import java.util.Set;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy;
 import org.alfresco.repo.policy.PolicyScope;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.version.common.VersionHistoryImpl;
+import org.alfresco.repo.version.common.VersionHistoryImpl.VersionComparatorAsc;
 import org.alfresco.repo.version.common.VersionImpl;
 import org.alfresco.repo.version.common.VersionUtil;
-import org.alfresco.repo.version.common.VersionHistoryImpl.VersionComparatorAsc;
 import org.alfresco.repo.version.common.versionlabel.SerialVersionLabelPolicy;
 import org.alfresco.service.cmr.repository.AspectMissingException;
 import org.alfresco.service.cmr.repository.AssociationRef;
@@ -1385,4 +1384,33 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
             }
         }
     }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.version.VersionService#isAVersion(org.alfresco.service.cmr.repository.NodeRef)
+     */
+	@Override
+    public boolean isAVersion(NodeRef nodeRef)
+    {
+		NodeRef realNodeRef = nodeRef;
+        if(nodeRef.getStoreRef().getProtocol().equals(VersionBaseModel.STORE_PROTOCOL))
+        {
+        	realNodeRef = VersionUtil.convertNodeRef(nodeRef);        	
+        }
+        return this.dbNodeService.hasAspect(realNodeRef, Version2Model.ASPECT_VERSION);
+    }
+	
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.version.VersionService#isVersioned(org.alfresco.service.cmr.repository.NodeRef)
+     */
+	@Override
+    public boolean isVersioned(NodeRef nodeRef)
+    {
+		NodeRef realNodeRef = nodeRef;
+        if(nodeRef.getStoreRef().getProtocol().equals(VersionBaseModel.STORE_PROTOCOL))
+        {
+        	realNodeRef = VersionUtil.convertNodeRef(nodeRef);        	
+        }
+        return this.dbNodeService.hasAspect(realNodeRef, ContentModel.ASPECT_VERSIONABLE);
+    }
+
 }
diff --git a/source/java/org/alfresco/repo/version/VersionServiceImpl.java b/source/java/org/alfresco/repo/version/VersionServiceImpl.java
index 6408cc37f1..9b40713fcf 100644
--- a/source/java/org/alfresco/repo/version/VersionServiceImpl.java
+++ b/source/java/org/alfresco/repo/version/VersionServiceImpl.java
@@ -1310,4 +1310,16 @@ public class VersionServiceImpl extends AbstractVersionServiceImpl implements Ve
             }
         }
     }
+
+	@Override
+    public boolean isAVersion(NodeRef nodeRef)
+    {
+		throw new UnsupportedOperationException();
+    }
+	
+	@Override
+    public boolean isVersioned(NodeRef nodeRef)
+    {
+        return this.nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE);
+    }
 }
diff --git a/source/java/org/alfresco/service/cmr/version/VersionService.java b/source/java/org/alfresco/service/cmr/version/VersionService.java
index 5a3320bc54..f18f7aafc3 100644
--- a/source/java/org/alfresco/service/cmr/version/VersionService.java
+++ b/source/java/org/alfresco/service/cmr/version/VersionService.java
@@ -24,7 +24,6 @@ import java.util.Map;
 
 import org.alfresco.repo.version.VersionServicePolicies.CalculateVersionLabelPolicy;
 import org.alfresco.service.Auditable;
-import org.alfresco.service.PublicService;
 import org.alfresco.service.cmr.repository.AspectMissingException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
@@ -49,6 +48,22 @@ public interface VersionService
      */
     @Auditable
     public StoreRef getVersionStoreReference();
+
+    /**
+     * Is the nodeRef a version node?
+     * 
+     * @return  true, if the nodeRef is a version node, false otherwise
+     */
+    @Auditable
+    public boolean isAVersion(NodeRef nodeRef);
+
+    /**
+     * Is the nodeRef versioned?
+     * 
+     * @return  true, if the nodeRef is versioned, false otherwise
+     */
+    @Auditable
+    public boolean isVersioned(NodeRef nodeRef);
     
     /**
      * Creates a new version based on the referenced node.