From 71d11e9d7997a29dbb8e829fb68fefec36dbe0f8 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Tue, 26 Feb 2008 15:13:48 +0000
Subject: [PATCH] Merged V2.2 to HEAD    7498: Deployment callback and event
 changes    7499: Build fix    7505: Fixed deployment script issue in IE   
 7525: Added sample job that will clean deployment attempts older than 180
 days (by default)    7526: Typo compilation fix

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8383 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../web/bean/wcm/DeploymentMonitor.java       | 27 ++++++++-----------
 .../ui/wcm/component/UIDeploymentServers.java |  2 +-
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/source/java/org/alfresco/web/bean/wcm/DeploymentMonitor.java b/source/java/org/alfresco/web/bean/wcm/DeploymentMonitor.java
index 57c87f6256..a8cc54f4d9 100644
--- a/source/java/org/alfresco/web/bean/wcm/DeploymentMonitor.java
+++ b/source/java/org/alfresco/web/bean/wcm/DeploymentMonitor.java
@@ -94,28 +94,23 @@ public class DeploymentMonitor implements DeploymentCallback, Serializable
          this.successful = true;
          this.finished = true;
       }
+      else if (event.getType().equals(Type.FAILED))
+      {
+         // if we get the FAILED event the deployment was unsuccessful
+         this.successful = false;
+         this.finished = true;
+         
+         this.reason = event.getMessage();
+      
+         if (logger.isDebugEnabled())
+            logger.debug(this.targetServerName + ": ERROR: " + this.reason);
+      }
       
       if (logger.isDebugEnabled())
          logger.debug(this.targetServerName + ": " + event.getType() + 
                   " " + event.getDestination());
    }
    
-   /**
-    * Informs the monitor an error occurred during deployment
-    * 
-    * @param err The error that caused the deployment to fail
-    */
-   public void errorOccurred(Throwable err)
-   {
-      this.reason = err.getMessage();
-      
-      if (logger.isDebugEnabled())
-         logger.debug(this.targetServerName + ": ERROR: " + this.reason); 
-      
-      this.successful = false;
-      this.finished = true;
-   }
-   
    @Override
    public String toString()
    {
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java b/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java
index 13081ed348..952aa67e45 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java
@@ -190,7 +190,7 @@ public class UIDeploymentServers extends UIInput
          out.write("</div>");
          
          out.write("\n<script type='text/javascript'>");
-         out.write("window.onload=Alfresco.checkDeployConfigPage();\n");
+         out.write("YAHOO.util.Event.on(window, \"load\", Alfresco.checkDeployConfigPage);");
          if (currentServer != null)
          {
             out.write("Alfresco.scrollToEditServer('");