Another merge.

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

source/java/org/alfresco/repo/domain/hibernate/PermissionsDaoComponentImpl.java

@@ -102,7 +102,10 @@ public class PermissionsDaoComponentImpl extends HibernateDaoSupport implements
         // done
         if (logger.isDebugEnabled())
         {
-            logger.debug("Created access control list for node: " + nodeRef);
+            logger.debug(
+                    "Created access control list for node: \n" +
+                    "   node: " + nodeRef + "\n" +
+                    "   acl: " + npe);
         }
         return npe;
     }
@@ -313,7 +316,7 @@ public class PermissionsDaoComponentImpl extends HibernateDaoSupport implements
         // done
         if (logger.isDebugEnabled())
         {
-            logger.debug("" + (entry == null ? "Did not find" : "Found") + "entry for criteria: \n" +
+            logger.debug("" + (entry == null ? "Did not find" : "Found") + " entry for criteria: \n" +
                     "   node: " + node.getId() + "\n" +
                     "   authority: " + authority + "\n" +
                     "   permission: " + permission);

source/java/org/alfresco/repo/security/permissions/impl/AbstractNodePermissionEntry.java

@@ -32,6 +32,18 @@ public abstract class AbstractNodePermissionEntry implements
     {
         super();
     }
+    
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder(200);
+        sb.append("NodePermissionEntry")
+          .append("[ node=").append(getNodeRef())
+          .append(", entries=").append(getPermissionEntries())
+          .append(", inherits=").append(inheritPermissions())
+          .append("]");
+        return sb.toString();
+    }
 
     @Override
     public boolean equals(Object o)