inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2008-02-26 15:13:48 +00:00
parent 225eca438c
commit 71d11e9d79
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/web/bean/wcm/DeploymentMonitor.java
View File

@@ -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()
{

2
source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java
View File

@@ -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('");