Merged V1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3987 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4133 .
   Removed LicenseComponent reference from projects\repository\source\java\org\alfresco\repo\descriptor\DescriptorServiceImpl.java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/jscript/Node.java

@@ -92,7 +92,7 @@ public class Node implements Serializable, Scopeable
     private final static String FOLDER_BROWSE_URL   = "/navigate/browse/{0}/{1}/{2}";
     
     /** Root scope for this object */
-    private Scriptable scope;
+    protected Scriptable scope;
     
     /** Node Value Converter */
     private NodeValueConverter converter = null;
@@ -110,18 +110,17 @@ public class Node implements Serializable, Scopeable
     private Node[] children = null;
     /** The properties of this node */
     private ScriptableQNameMap<String, Serializable> properties = null;
-    private ServiceRegistry services = null;
+    protected ServiceRegistry services = null;
     private NodeService nodeService = null;
     private Boolean isDocument = null;
     private Boolean isContainer = null;
     private String displayPath = null;
-    private TemplateImageResolver imageResolver = null;
+    protected TemplateImageResolver imageResolver = null;
     private Node parent = null;
     private ChildAssociationRef primaryParentAssoc = null;
     // NOTE: see the reset() method when adding new cached members!
     
     
-    
     // ------------------------------------------------------------------------------
     // Construction
     
@@ -464,6 +463,20 @@ public class Node implements Serializable, Scopeable
         return isDocument();
     }
     
+    /**
+     * @return true if the Node is a Category
+     */
+    public boolean isCategory()
+    {
+        // this valid is overriden by the CategoryNode sub-class
+        return false;
+    }
+    
+    public boolean jsGet_isCategory()
+    {
+        return isCategory();
+    }
+    
     /**
      * @return The list of aspects applied to this node
      */
@@ -890,7 +903,8 @@ public class Node implements Serializable, Scopeable
        this.services.getPermissionService().deletePermission(this.nodeRef, authority, permission);
     }
     
-    // -------------
+    
+    // ------------------------------------------------------------------------------
     // Ownership API
     
     /**
@@ -1145,7 +1159,7 @@ public class Node implements Serializable, Scopeable
         {
             if (destination != null)
             {
-                NodeRef copyRef = this.services.getCopyService().copy(
+                NodeRef copyRef = this.services.getCopyService().copyAndRename(
                         this.nodeRef,
                         destination.getNodeRef(),
                         ContentModel.ASSOC_CONTAINS,