Merged V2.2 to HEAD

7462: Renamed ManageLinkValidationTaskDialog to ManageReviewTaskDialog as it is now more generic
         Enabled deployment and link validation in parallel review tasks
         Created separate JSP page for manage change request task dialog
         When a server is edited it is now scrolled to
         Some minor UI tidyup
   7467: Added ability to define excludes for a deployment via a regular expression
   7475: Incorporated new icons from Linton
   7492: Allows multiple callbacks for deployment. Adds new FAILED deployment event.
   7493: Added ability to view previous deployment attempts


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

source/java/org/alfresco/service/cmr/avm/deploy/DeploymentEvent.java

@@ -15,11 +15,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
- * As a special exception to the terms and conditions of version 2.0 of 
- * the GPL, you may redistribute this Program in connection with Free/Libre 
- * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
- * the FLOSS exception, and it is also available here: 
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
  * http://www.alfresco.com/legal/licensing"
  */
 
@@ -33,7 +33,7 @@ import org.alfresco.util.Pair;
  * Interface for Deployment Events.
  * @author britt
  */
-public class DeploymentEvent implements Serializable 
+public class DeploymentEvent implements Serializable
 {
     private static final long serialVersionUID = 2696116904379321786L;
 
@@ -47,13 +47,14 @@ public class DeploymentEvent implements Serializable
         UPDATED,   // Overwrote the destination.
         DELETED,   // Deleted the destination node.
         START,     // A Deployment has begun.
-        END        // A Deployment has ended.
+        END,       // A Deployment has ended.
+        FAILED     // A Deployment failed.
     };
-    
+
     private Type fType;
-    
+
     private Pair<Integer, String> fSource;
-    
+
     private String fDestination;
 
     public DeploymentEvent(Type type, Pair<Integer, String> source, String destination)
@@ -62,7 +63,7 @@ public class DeploymentEvent implements Serializable
         fSource = source;
         fDestination = destination;
     }
-    
+
     /**
      * Get the type of the event.
      * @return The type.
@@ -71,7 +72,7 @@ public class DeploymentEvent implements Serializable
     {
         return fType;
     }
-    
+
     /**
      * Get the source node version and path.
      * @return
@@ -89,7 +90,7 @@ public class DeploymentEvent implements Serializable
     {
         return fDestination;
     }
-    
+
     /**
      * Get a String representation.
      */

source/java/org/alfresco/service/cmr/avm/deploy/DeploymentService.java

@@ -1,8 +1,10 @@
 /**
- * 
+ *
  */
 package org.alfresco.service.cmr.avm.deploy;
 
+import java.util.List;
+
 import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.util.NameMatcher;
 
@@ -10,7 +12,7 @@ import org.alfresco.util.NameMatcher;
  * A service to handle AVM repository to remote AVM repository deployment.
  * @author britt
  */
-public interface DeploymentService 
+public interface DeploymentService
 {
     /**
      * Deploys the differences between what is is the local source path
@@ -35,8 +37,8 @@ public interface DeploymentService
                                              boolean createDst,
                                              boolean dontDelete,
                                              boolean dontDo,
-                                             DeploymentCallback callback);
-    
+                                             List<DeploymentCallback> callback);
+
     /**
      * Get A reference to an ActionService instance on a remote Alfresco Server.
      * @param hostName
@@ -54,7 +56,7 @@ public interface DeploymentService
      * @param srcPath The path to deploy from.
      * @param hostName The hostname of the filesystem receiver.
      * @param port The port to connect to.
-     * @param userName The username for authentication 
+     * @param userName The username for authentication
      * @param password The password for authentication
      * @param dstTarget The target on the deployment receiver.
      * @param createDst Flag for whether a missing destination should be created.
@@ -68,7 +70,7 @@ public interface DeploymentService
                                                String dstTarget,
                                                NameMatcher matcher,
                                                boolean createDst,
-                                               boolean dontDelete, 
+                                               boolean dontDelete,
                                                boolean dontDo,
-                                               DeploymentCallback callback);
+                                               List<DeploymentCallback> callback);
 }