From d19fc0682ecee0b0f2df7c010f47fc67f899c310 Mon Sep 17 00:00:00 2001
From: Britt Park <britt.park@alfresco.com>
Date: Tue, 9 Jan 2007 21:18:21 +0000
Subject: [PATCH] Added extra information in toString of AVMNodeDescriptor.
 Added debug logging for various things in AVMSyncServiceImpl. Fixed "from"
 path in workflow submits so that the ROOT directory does not get wiped out in
 the originating sandbox. Fixed avm.jsp so that it works again.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/avm/AVMSyncServiceImpl.java | 43 +++++++++++++++++++
 .../service/cmr/avm/AVMNodeDescriptor.java    |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java b/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
index 8d9987189f..9f74c2ce67 100644
--- a/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
@@ -89,6 +89,18 @@ public class AVMSyncServiceImpl implements AVMSyncService
                                        int dstVersion, String dstPath,
                                        NameMatcher excluder)
     {
+        if (fgLogger.isDebugEnabled())
+        {
+            fgLogger.debug(srcPath + " : " + dstPath);
+            try
+            {
+                throw new Exception();
+            }
+            catch (Exception e)
+            {
+                fgLogger.debug("Stack Trace: ", e);
+            }
+        }
         if (srcPath == null || dstPath == null)
         {
             throw new AVMBadArgumentException("Illegal null path.");
@@ -318,6 +330,17 @@ public class AVMSyncServiceImpl implements AVMSyncService
                        NameMatcher excluder, boolean ignoreConflicts, boolean ignoreOlder,
                        boolean overrideConflicts, boolean overrideOlder, String tag, String description)
     {
+        if (fgLogger.isDebugEnabled())
+        {
+            try
+            {
+                throw new Exception("Stack Trace.");
+            }
+            catch (Exception e)
+            {
+                fgLogger.debug("Stack trace: ", e);
+            }
+        }
         Map<String, Integer> storeVersions = new HashMap<String, Integer>();
         Set<String> destStores = new HashSet<String>();
         for (AVMDifference diff : diffList)
@@ -331,6 +354,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
             {
                 throw new AVMSyncException("Malformed AVMDifference.");
             }
+            if (fgLogger.isDebugEnabled())
+            {
+                fgLogger.debug("update: " + diff);
+            }
             // Snapshot the source if needed.
             int version = diff.getSourceVersion();
             if (version < 0)
@@ -656,6 +683,18 @@ public class AVMSyncServiceImpl implements AVMSyncService
         {
             throw new AVMNotFoundException("Not found: " + underlyingPath);
         }
+        if (fgLogger.isDebugEnabled())
+        {
+            fgLogger.debug("flatten: " + layerNode + " " + underlyingNode);
+            try
+            {
+                throw new Exception("Stack Trace:");
+            }
+            catch (Exception e)
+            {
+                fgLogger.debug("Stack Trace: ", e);
+            }
+        }
         flatten(layerNode, underlyingNode);
     }
     
@@ -666,6 +705,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
      */
     private boolean flatten(AVMNodeDescriptor layer, AVMNodeDescriptor underlying)
     {
+        if (fgLogger.isDebugEnabled())
+        {
+            fgLogger.debug("flatten: " + layer + " " + underlying);
+        }
         if (!layer.isLayeredDirectory())
         {
             return false;
diff --git a/source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java b/source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java
index f26c32d44f..c0a16ec112 100644
--- a/source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java
+++ b/source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java
@@ -411,7 +411,7 @@ public class AVMNodeDescriptor implements Serializable
             case AVMNodeType.PLAIN_FILE :
                 return "[PF:" + fID + "]";
             case AVMNodeType.PLAIN_DIRECTORY :
-                return "[PD:" + fID + "]";
+                return "[PD:" + fID + ":" + fPath + "]";
             case AVMNodeType.LAYERED_FILE :
                 return "[LF:" + fID + ":" + fIndirection + "]";
             case AVMNodeType.LAYERED_DIRECTORY :