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 (V2.1 sourced fixes)

Browse Source 
7121: Merged V2.1 to V2.2
      7049: Fix for unreported duplicate component ID error (very rarely seen) in browse WCM sandbox JSP
      7058: Fixes failure to rollback correctly on failed alfresco->alfresco deployment.
      7074: Added filtering/access control checks to the AVM virtualization view.
      7083: Added transaction handling to calls involving preview store
      7084: xmlsec library update to 1.4.1
      7092: Missing config update from the AVM filtering checkin.
   7124: Merged V2.1 to V2.2
      7091: Fix to several issues found with Regenerate Renditions wizard and FormsService
   7125: Merged V2.1 to V2.2
      7093: Fixes to workaround some deployment issues being experienced by a customer.
      7094: Fix for previous build failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-11-13 02:41:28 +00:00
parent 83919a08f1
commit f6ae19f3f5
7 changed files with 149 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/web/ui/wcm/component/UIDeployWebsite.java
View File

@@ -25,6 +25,7 @@
package org.alfresco.web.ui.wcm.component;
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -44,7 +45,6 @@ import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.wcm.AVMUtil;
import org.alfresco.web.bean.wcm.DeploymentMonitor;
import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -80,6 +80,7 @@ public class UIDeployWebsite extends UIInput
return "org.alfresco.faces.DeployWebsite";
}
@SuppressWarnings("unchecked")
@Override
public void decode(FacesContext context)
{
@@ -186,14 +187,24 @@ public class UIDeployWebsite extends UIInput
for (ChildAssociationRef ref : deployReportRefs)
{
NodeRef report = ref.getChildRef();
Boolean success = (Boolean)nodeService.getProperty(report,
WCMAppModel.PROP_DEPLOYSUCCESSFUL);
int deployedVersion = (Integer)nodeService.getProperty(report,
WCMAppModel.PROP_DEPLOYVERSION);
if (success.booleanValue() && (deployingVersion == deployedVersion))
if (report != null)
{
serversAlreadyDeployed.add((String)nodeService.getProperty(report,
WCMAppModel.PROP_DEPLOYSERVER));
int deployedVersion = -1;
Boolean success = (Boolean)nodeService.getProperty(report,
WCMAppModel.PROP_DEPLOYSUCCESSFUL);
Serializable deployVersionObj = nodeService.getProperty(report,
WCMAppModel.PROP_DEPLOYVERSION);
if (deployVersionObj != null && deployVersionObj instanceof Integer)
{
deployedVersion = (Integer)deployVersionObj;
}
if (success != null && success.booleanValue() && (deployingVersion == deployedVersion))
{
serversAlreadyDeployed.add((String)nodeService.getProperty(report,
WCMAppModel.PROP_DEPLOYSERVER));
}
}
}

30
source/java/org/alfresco/web/ui/wcm/component/UIDeploymentReports.java
View File

@@ -25,6 +25,7 @@
package org.alfresco.web.ui.wcm.component;
import java.io.IOException;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -208,13 +209,27 @@ public class UIDeploymentReports extends SelfRenderingComponent
// extract the information we need to display
String server = (String)nodeService.getProperty(deploymentReport, WCMAppModel.PROP_DEPLOYSERVER);
Integer snapshot = (Integer)nodeService.getProperty(deploymentReport, WCMAppModel.PROP_DEPLOYVERSION);
String creator = (String)nodeService.getProperty(deploymentReport, ContentModel.PROP_CREATOR);
Date startTime = (Date)nodeService.getProperty(deploymentReport, WCMAppModel.PROP_DEPLOYSTARTTIME);
String started = null;
if (startTime != null)
{
started = Utils.getDateTimeFormat(context).format(startTime);
}
Date endTime = (Date)nodeService.getProperty(deploymentReport, WCMAppModel.PROP_DEPLOYENDTIME);
String started = Utils.getDateTimeFormat(context).format(startTime);
String finished = Utils.getDateTimeFormat(context).format(endTime);
String finished = null;
if (endTime != null)
{
finished = Utils.getDateTimeFormat(context).format(endTime);
}
Boolean success = (Boolean)nodeService.getProperty(deploymentReport, WCMAppModel.PROP_DEPLOYSUCCESSFUL);
if (success == null)
{
success = Boolean.FALSE;
}
String failReason = (String)nodeService.getProperty(deploymentReport, WCMAppModel.PROP_DEPLOYFAILEDREASON);
String content = "";
ContentReader reader = contentService.getReader(deploymentReport, ContentModel.PROP_CONTENT);
@@ -231,6 +246,13 @@ public class UIDeploymentReports extends SelfRenderingComponent
}
}
int snapshot = -1;
Serializable snapshotObj = nodeService.getProperty(deploymentReport, WCMAppModel.PROP_DEPLOYVERSION);
if (snapshotObj != null && snapshotObj instanceof Integer)
{
snapshot = (Integer)snapshotObj;
}
out.write("<table cellspacing='0' cellpadding='2' border='0' width='100%'>");
out.write("<tr><td width='40' valign='top'><img src='");
out.write(context.getExternalContext().getRequestContextPath());
@@ -261,7 +283,7 @@ public class UIDeploymentReports extends SelfRenderingComponent
out.write("<div style='margin-top: 6px;'>");
out.write(Application.getMessage(context, "snapshot"));
out.write(":&nbsp;");
out.write(snapshot.toString());
out.write(Integer.toString(snapshot));
out.write("</div>");
out.write("<div style='margin-top: 3px;'>");
out.write(Application.getMessage(context, "deploy_started"));