The outside hooks for AVMSyncService are in place and the implementation

of the simplest method, resetLayer is done.
Also fixed goofy merge induced bug in DbNodeServiceImpl.
Can we make merging a punishment for naughty Alfrescans?


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3778 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/ServiceRegistry.java

@@ -21,6 +21,7 @@ import java.util.Collection;
 import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.audit.AuditService;
 import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avmsync.AVMSyncService;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.lock.LockService;
@@ -88,6 +89,7 @@ public interface ServiceRegistry
     static final QName WORKFLOW_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "WorkflowService");
     static final QName AUDIT_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "AuditService");
     static final QName AVM_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "AVMService");
+    static final QName AVM_SYNC_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "AVMSyncService");
     
     /**
      * Get the list of services provided by the Repository
@@ -280,4 +282,11 @@ public interface ServiceRegistry
      */
     @NotAuditable
     AVMService getAVMService();
+    
+    /**
+     * Get the AVM Sync Service.
+     * @return The AVM Sync Service.
+     */
+    @NotAuditable
+    AVMSyncService getAVMSyncService();
 }

source/java/org/alfresco/service/cmr/avmsync/AVMDifference.java

@@ -17,12 +17,107 @@
 
 package org.alfresco.service.cmr.avmsync;
 
+import java.io.Serializable;
+
 /**
  * Represents the difference between corresponding nodes
  * in parallel avm node trees.  It it indicates for the difference
  * whether the source is older, newer, or in conflict with the destination.
  * @author britt
  */
-public class AVMDifference
+public class AVMDifference implements Serializable
 {
+    private static final long serialVersionUID = -589722861571724954L;
+
+    public static final int NEWER = 0;
+    public static final int OLDER = 1;
+    public static final int CONFLICT = 2;
+    
+    /**
+     * Version number of the source node.
+     */
+    private int fSourceVersion;
+    
+    /**
+     * Path of the source node.
+     */
+    private String fSourcePath;
+    
+    /**
+     * Version number of the destination node.
+     */
+    private int fDestVersion;
+    
+    /**
+     * Path of the destination node.
+     */
+    private String fDestPath;
+    
+    /**
+     * The difference code.
+     */
+    private int fDiffCode;
+    
+    /**
+     * Make one up.
+     * @param srcVersion The source version.
+     * @param srcPath the source path.
+     * @param dstVersion The destination version.
+     * @param dstPath The destination path. 
+     * @param diffCode The difference code, NEWER, OLDER, CONFLICT
+     */
+    public AVMDifference(int srcVersion, String srcPath,
+                         int dstVersion, String dstPath, int diffCode)
+    {
+        fSourceVersion = srcVersion;
+        fSourcePath = srcPath;
+        fDestVersion = dstVersion;
+        fDestPath = dstPath;
+        fDiffCode = diffCode;
+    }
+    
+    /**
+     * Get the source version number.
+     * @return The source version number.
+     */
+    public int getSourceVersion()
+    {
+        return fSourceVersion;
+    }
+    
+    /**
+     * Get the source path.
+     * @return The source path.
+     */
+    public String getSourcePath()
+    {
+        return fSourcePath;
+    }
+    
+    /**
+     * Get the destination version number.
+     * @return The destination version number.
+     */
+    public int getDestinationVersion()
+    {
+        return fDestVersion;
+    }
+    
+    /**
+     * Get the destination path.
+     * @return The destination path.
+     */
+    public String getDestinationPath()
+    {
+        return fDestPath;
+    }
+
+    /**
+     * Get the difference code, NEWER, OLDER, CONFLICT.
+     * @return The difference code.
+     */
+    public int getDifferenceCode()
+    {
+        return fDiffCode;
+    }
 }

source/java/org/alfresco/service/cmr/avmsync/AVMSyncService.java

@@ -24,7 +24,7 @@ import java.util.List;
  * corresponding avm node trees.
  * @author britt
  */
-public interface AvmSyncService
+public interface AVMSyncService
 {
     /**
      * Get a difference list between two corresponding node trees.