ALF-10132: FSTR is not working, due to fault in TransferService

- Initial tidying and fixing-up during investigation

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

source/java/org/alfresco/service/cmr/transfer/TransferDefinition.java

@@ -46,8 +46,12 @@ public class TransferDefinition implements Serializable
      */
     private static final long serialVersionUID = -8497919749300106861L;
     
-    // Which nodes to deploy
+    // Which nodes to transfer
     private Set<NodeRef> nodes;
+
+    // Which nodes are to be explicitly removed from the target repository 
+    // (irrespective of their state in the source repository)
+    private Set<NodeRef> nodesToRemove;
     
     // Which aspects to exclude
     private Set<QName> excludedAspects;
@@ -80,6 +84,24 @@ public class TransferDefinition implements Serializable
         this.setNodes(Arrays.asList(nodes));
     }
 
+    /**
+     * Set nodes that are to be explicitly removed from the the target repository
+     * @param nodes
+     */
+    public void setNodesToRemove(Collection<NodeRef> nodes)
+    {
+        this.nodesToRemove = new HashSet<NodeRef>(nodes);
+    }
+    
+    /**
+     * Set nodes that are to be explicitly removed from the the target repository
+     * @param nodes
+     */
+    public void setNodesToRemove(NodeRef...nodes)
+    {
+        this.setNodesToRemove(Arrays.asList(nodes));
+    }
+
     /**
      * Get which nodes to transfer
      * @return
@@ -89,6 +111,15 @@ public class TransferDefinition implements Serializable
         return nodes;
     }
 
+    /**
+     * Get the list of nodes that are to be explicitly removed from the target repository
+     * @return
+     */
+    public Set<NodeRef> getNodesToRemove()
+    {
+        return nodesToRemove;
+    }
+
     /**
      * Sets which aspects to exclude from transfer
      *