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 
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
This commit is contained in:
Derek Hulley
2008-02-26 14:19:37 +00:00
parent 6ce387a808
commit 4780da35d5
22 changed files with 6555 additions and 5687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
config/alfresco/messages/webclient.properties
View File

@@ -1138,7 +1138,7 @@ pending_diff=Visual Comparison
pending_promote=Submit Now
pending_abort=Abort Submission
task_done_resubmit_all=Task Done & Re-Submit All
reset_deploy_history=Reset Deployment History
delete_all_deploy_reports=Delete All Deploy Reports
# Website actions and dialog messages
title_import_content=Web Project Bulk Import
@@ -1208,7 +1208,6 @@ deploy_sandbox_desc=Select a test server to deploy to and click OK. This server
redeploy_sandbox_title=Deploy Sandbox Changes
redeploy_sandbox_desc=Click OK to deploy any changes in the sandbox to your allocated test server.
deploy_destination=Select the destination server(s) to deploy to
deploy_status=Snapshot {0} is being deployed in the background, refresh this page until the ''View Deployment Report'' link appears.
deploying=Deploying...
deploy_successful=Deployment Successful
deploy_failed=Deployment Failed
@@ -1218,10 +1217,12 @@ deploy_test_server_allocated=The test server ''{0}'' is allocated to this sandbo
deploy_started=Started
deploy_finished=Finished
deployed_by=By
deployment_report_action=View Deployment
deployment_report_title=View Deployment Report
deployment_report_title_for=View Deployment Report For Snaphot {0}
deployment_report_desc=View deployment details for each of the servers deployed to.
deployment_report_action=View Deployments
deployment_report_title=Last Deployment Report
deployment_report_desc=View deployment details for each of the servers selected in the last deployment.
more_deploy_reports=More Deployment Reports
deployment_previous_report_title=Deployment Report for {0}
deployment_previous_report_desc=View deployment details for each of the servers selected in the deployment.
monitor_deployment_title=Monitor Deployment
monitor_deployment_desc=Monitors the progress of a deployment to one or more servers.
deploy_status_in_progress=IN PROGRESS
@@ -1242,9 +1243,15 @@ deploy_server_password=Password
deploy_server_url=URL
deploy_server_allocated=Allocated
deploy_server_source_path=Source Path
deploy_server_excludes=Excludes
deploy_server_target_name=Target Name
deploy_automatically=Auto Deploy
deploy_automatically_info=This will deploy the changes from this submission upon approval.
deploy_attempt_date=Attempt Date
select_deploy_attempt=View Deployment Attempt
deployed_to_servers=Deployed To
no_deploy_attempts=There are no deployment attempts to display in this date range.
no_deploy_reports=Deployment details can not be found, this is probably because the deployment is still progressing, refresh this page until details appear.
port_must_be_number=Port must contain a number.
edit_deploy_server=Edit Deployment Server Details
delete_deploy_server=Delete Deployment Server
@@ -1393,6 +1400,7 @@ user_filter_user=User
date_filter_when=When
date_filter_all=All
date_filter_today=Today
date_filter_yesterday=Yesterday
date_filter_week=Last 7 days
date_filter_month=Last 30 days
recovery_report=Recovered Items Report

21
config/alfresco/web-client-config-dialogs.xml
View File

@@ -274,10 +274,8 @@
icon="/images/icons/deploy_large.gif" />
<dialog name="viewDeploymentReport" page="/jsp/wcm/deployment-report.jsp"
managed-bean="ViewDeploymentReportDialog"
title-id="deployment_report_title"
icon="/images/icons/deployment_report_large.gif"
description-id="deployment_report_desc" show-ok-button="false" />
managed-bean="ViewDeploymentReportDialog" icon="/images/icons/deployment_report_large.gif"
show-ok-button="false" />
<dialog name="monitorDeployment" page="/jsp/wcm/monitor-deployment.jsp"
managed-bean="MonitorDeploymentDialog"
@@ -594,7 +592,16 @@
<config evaluator="node-type" condition="wcmwf:reviewTask">
<dialogs>
<dialog name="manageTask" page="/jsp/wcm/manage-review-task-dialog.jsp"
managed-bean="ManageLinkValidationTaskDialog"
managed-bean="ManageReviewTaskDialog"
icon="/images/icons/manage_workflow_task_large.gif"
description-id="manage_task_desc" />
</dialogs>
</config>
<config evaluator="node-type" condition="wcmwf:parallelReviewTask">
<dialogs>
<dialog name="manageTask" page="/jsp/wcm/manage-review-task-dialog.jsp"
managed-bean="ManageReviewTaskDialog"
icon="/images/icons/manage_workflow_task_large.gif"
description-id="manage_task_desc" />
</dialogs>
@@ -603,7 +610,7 @@
<config evaluator="node-type" condition="wcmwf:verifyBrokenLinksTask">
<dialogs>
<dialog name="manageTask" page="/jsp/wcm/manage-review-task-dialog.jsp"
managed-bean="ManageLinkValidationTaskDialog"
managed-bean="ManageReviewTaskDialog"
icon="/images/icons/manage_workflow_task_large.gif"
description-id="manage_task_desc" />
</dialogs>
@@ -611,7 +618,7 @@
<config evaluator="node-type" condition="wcmwf:changeRequestTask">
<dialogs>
<dialog name="manageTask" page="/jsp/wcm/manage-review-task-dialog.jsp"
<dialog name="manageTask" page="/jsp/wcm/manage-change-request-task-dialog.jsp"
managed-bean="ManageChangeRequestTaskDialog"
icon="/images/icons/manage_workflow_task_large.gif"
description-id="manage_task_desc" />

12
config/alfresco/web-client-config-wcm-actions.xml
View File

@@ -279,14 +279,14 @@
</params>
</action>
<!-- Reset deployment history action -->
<action id="reset_deployment_history">
<!-- Delete all deployment reports action -->
<action id="delete_all_deploy_reports">
<permissions>
<permission allow="true">Delete,Write,CreateChildren</permission>
</permissions>
<label-id>reset_deploy_history</label-id>
<image>/images/icons/remove_item.gif</image>
<action>#{AVMBrowseBean.resetDeploymentHistory}</action>
<label-id>delete_all_deploy_reports</label-id>
<image>/images/icons/delete_deploy_reports.gif</image>
<action>#{AVMBrowseBean.deleteAllDeploymentReports}</action>
<action-listener>#{BrowseBean.setupSpaceAction}</action-listener>
<params>
<param name="id">#{actionContext.id}</param>
@@ -398,7 +398,7 @@
<action idref="create_webapp" />
<action idref="edit_website" />
<action idref="invite_website_users" />
<action idref="reset_deployment_history" />
<action idref="delete_all_deploy_reports" />
<action idref="delete_space" />
</action-group>

4
source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
View File

@@ -1462,9 +1462,9 @@ public class AVMBrowseBean implements IContextListener
}
/**
* Removes all deploymentreport nodes associated with the web project
* Deletes all deploymentreport nodes associated with the web project
*/
public String resetDeploymentHistory()
public String deleteAllDeploymentReports()
{
FacesContext context = FacesContext.getCurrentInstance();
RetryingTransactionHelper txnHelper = Repository.getRetryingTransactionHelper(context);

11
source/java/org/alfresco/web/bean/wcm/DeploymentServerConfig.java
View File

@@ -49,6 +49,7 @@ public final class DeploymentServerConfig implements Serializable
public static final String PROP_URL = "url";
public static final String PROP_SOURCE_PATH = "sourcePath";
public static final String PROP_TARGET_NAME = "targetName";
public static final String PROP_EXCLUDES = "excludes";
public static final String PROP_ALLOCATED_TO = "allocatedTo";
public static final String PROP_ON_APPROVAL = "onApproval";
@@ -153,6 +154,11 @@ public final class DeploymentServerConfig implements Serializable
repoProps.put(WCMAppModel.PROP_DEPLOYSOURCEPATH, (Serializable)this.props.get(PROP_SOURCE_PATH));
}
if (this.props.get(PROP_EXCLUDES) != null && ((String)this.props.get(PROP_EXCLUDES)).length() > 0)
{
repoProps.put(WCMAppModel.PROP_DEPLOYEXCLUDES, (Serializable)this.props.get(PROP_EXCLUDES));
}
if (this.props.get(PROP_ALLOCATED_TO) != null && ((String)this.props.get(PROP_ALLOCATED_TO)).length() > 0)
{
repoProps.put(WCMAppModel.PROP_DEPLOYSERVERALLOCATEDTO, (Serializable)this.props.get(PROP_ALLOCATED_TO));
@@ -217,6 +223,11 @@ public final class DeploymentServerConfig implements Serializable
this.props.put(PROP_SOURCE_PATH, (String)repoProps.get(WCMAppModel.PROP_DEPLOYSOURCEPATH));
}
if (repoProps.get(WCMAppModel.PROP_DEPLOYEXCLUDES) != null)
{
this.props.put(PROP_EXCLUDES, (String)repoProps.get(WCMAppModel.PROP_DEPLOYEXCLUDES));
}
if (repoProps.get(WCMAppModel.PROP_DEPLOYSERVERALLOCATEDTO) != null)
{
this.props.put(PROP_ALLOCATED_TO, (String)repoProps.get(WCMAppModel.PROP_DEPLOYSERVERALLOCATEDTO));

125
source/java/org/alfresco/web/bean/wcm/DeploymentUtil.java
View File

@@ -25,6 +25,9 @@
package org.alfresco.web.bean.wcm;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import javax.faces.context.FacesContext;
@@ -34,6 +37,7 @@ import org.alfresco.model.WCMAppModel;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.util.ISO9075;
@@ -52,7 +56,28 @@ public final class DeploymentUtil
{
private static final Log logger = LogFactory.getLog(DeploymentUtil.class);
/**
* Returns all deployment attempts for the given store
*
* @param store The store to get the deployment attempts for
* @return List of NodeRef's representing the deployment attempts
*/
public static List<NodeRef> findDeploymentAttempts(String store)
{
// return all deployment attempts
return findDeploymentAttempts(store, null, null);
}
/**
* Returns all deployment attempts for the given store
*
* @param store The store to get the deployment attempts for
* @param fromDate If present only attempts after the given date are returned
* @param toDate If present only attempts before the given date are returned, if null
* toDate defaults to today's date
* @return List of NodeRef's representing the deployment attempts
*/
public static List<NodeRef> findDeploymentAttempts(String store, Date fromDate, Date toDate)
{
FacesContext fc = FacesContext.getCurrentInstance();
SearchService searchService = Repository.getServiceRegistry(fc).getSearchService();
@@ -67,13 +92,78 @@ public final class DeploymentUtil
query.append(store);
query.append("\"");
// constrain the search by date if a fromDate is applied
if (fromDate != null)
{
if (toDate == null)
{
toDate = new Date();
}
// see if the dates are the same (ignoring the time)
boolean sameDate = false;
Calendar fromCal = new GregorianCalendar();
fromCal.setTime(fromDate);
Calendar toCal = new GregorianCalendar();
toCal.setTime(toDate);
if ((fromCal.get(Calendar.YEAR) == toCal.get(Calendar.YEAR)) &&
(fromCal.get(Calendar.MONTH) == toCal.get(Calendar.MONTH)) &&
(fromCal.get(Calendar.DAY_OF_MONTH) == toCal.get(Calendar.DAY_OF_MONTH)))
{
sameDate = true;
}
// add date to query
query.append(" AND @");
query.append(NamespaceService.WCMAPP_MODEL_PREFIX);
query.append("\\:");
query.append(WCMAppModel.PROP_DEPLOYATTEMPTTIME.getLocalName());
query.append(":");
if (sameDate)
{
// convert date into format needed for range query
String queryDate = formatLuceneQueryDate(fromDate, false);
// query for exact date
query.append("\"");
query.append(queryDate);
query.append("\"");
}
else
{
// convert to date into format needed for range query
String queryFromDate = formatLuceneQueryDate(fromDate, true);
String queryToDate = formatLuceneQueryDate(toDate, true);
// create a date range query
query.append("[");
query.append(queryFromDate);
query.append(" TO ");
query.append(queryToDate);
query.append("]");
}
}
if (logger.isDebugEnabled())
logger.debug("Finding deploymentattempt nodes using query: " + query.toString());
ResultSet results = null;
List<NodeRef> attempts = new ArrayList<NodeRef>();
try
{
// sort the results by deploymentattempttime
SearchParameters sp = new SearchParameters();
sp.addStore(Repository.getStoreRef());
sp.setLanguage(SearchService.LANGUAGE_LUCENE);
sp.setQuery(query.toString());
sp.addSort("@" + WCMAppModel.PROP_DEPLOYATTEMPTTIME, false);
// execute the query
results = searchService.query(Repository.getStoreRef(),
SearchService.LANGUAGE_LUCENE, query.toString());
results = searchService.query(sp);
if (logger.isDebugEnabled())
logger.debug("Found " + results.length() + " deployment attempts");
for (NodeRef attempt : results.getNodeRefs())
{
@@ -218,7 +308,6 @@ public final class DeploymentUtil
return findServers(webProject, false, availableOnly);
}
private static List<NodeRef> findServers(NodeRef webProject, boolean live, boolean availableOnly)
{
FacesContext context = FacesContext.getCurrentInstance();
@@ -257,6 +346,9 @@ public final class DeploymentUtil
query.append("\"");
}
if (logger.isDebugEnabled())
logger.debug("Finding deployment servers using query: " + query.toString());
// execute the query
ResultSet results = null;
List<NodeRef> servers = new ArrayList<NodeRef>();
@@ -265,6 +357,9 @@ public final class DeploymentUtil
results = searchService.query(Repository.getStoreRef(),
SearchService.LANGUAGE_LUCENE, query.toString());
if (logger.isDebugEnabled())
logger.debug("Found " + results.length() + " deployment servers");
for (NodeRef server : results.getNodeRefs())
{
servers.add(server);
@@ -280,4 +375,28 @@ public final class DeploymentUtil
return servers;
}
private static String formatLuceneQueryDate(Date date, boolean range)
{
Calendar cal = new GregorianCalendar();
cal.setTime(date);
StringBuilder queryDate = new StringBuilder();
queryDate.append(cal.get(Calendar.YEAR));
if (range)
{
queryDate.append("\\");
}
queryDate.append("-");
queryDate.append((cal.get(Calendar.MONTH)+1));
if (range)
{
queryDate.append("\\");
}
queryDate.append("-");
queryDate.append(cal.get(Calendar.DAY_OF_MONTH));
queryDate.append("T00:00:00");
return queryDate.toString();
}
}

4
source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java
View File

@@ -77,10 +77,6 @@ public class ManageChangeRequestTaskDialog extends ManageTaskDialog
{
super.init(parameters);
// reset any link validation state from other WCM task dialogs
this.avmBrowseBean.setLinkValidationState(null);
this.avmBrowseBean.setLinkValidationMonitor(null);
// reset the doResubmit flag
this.doResubmitNow = false;
}

14
source/java/org/alfresco/web/bean/wcm/ManageLinkValidationTaskDialog.java → source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java
View File

@@ -32,7 +32,6 @@ import javax.faces.context.FacesContext;
import javax.transaction.UserTransaction;
import org.alfresco.linkvalidation.LinkValidationReport;
import org.alfresco.model.WCMAppModel;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.sandbox.SandboxConstants;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -45,11 +44,11 @@ import org.apache.commons.logging.LogFactory;
/**
* Bean implementation for the "Manage Task" dialog when dealing
* with link validation related WCM tasks.
* with review related WCM tasks.
*
* @author gavinc
*/
public class ManageLinkValidationTaskDialog extends ManageTaskDialog
public class ManageReviewTaskDialog extends ManageTaskDialog
{
private static final long serialVersionUID = 59524560340308134L;
@@ -58,7 +57,7 @@ public class ManageLinkValidationTaskDialog extends ManageTaskDialog
protected NodeRef webProjectRef;
protected AVMBrowseBean avmBrowseBean;
private static final Log logger = LogFactory.getLog(ManageLinkValidationTaskDialog.class);
private static final Log logger = LogFactory.getLog(ManageReviewTaskDialog.class);
// ------------------------------------------------------------------------------
// Implementation
@@ -88,9 +87,6 @@ public class ManageLinkValidationTaskDialog extends ManageTaskDialog
String stagingStore = AVMUtil.getStoreId(this.store);
this.webProjectRef = AVMUtil.getWebProjectNodeFromStore(stagingStore);
if (logger.isDebugEnabled())
logger.debug("Retrieving link validation report from store '" + this.store + "'");
PropertyValue val = this.getAvmService().getStoreProperty(this.store,
SandboxConstants.PROP_LINK_VALIDATION_REPORT);
if (val != null)
@@ -130,8 +126,8 @@ public class ManageLinkValidationTaskDialog extends ManageTaskDialog
public String viewLinkReport()
{
if (logger.isDebugEnabled())
logger.debug("Viewing link validation report for webapp '" +
AVMUtil.buildStoreWebappPath(this.store, this.webapp) + "'");
logger.debug("Viewing link validation report for: " +
AVMUtil.buildStoreWebappPath(this.store, this.webapp));
Map<String, String> params = new HashMap<String, String>(3);
params.put("store", this.store);

111
source/java/org/alfresco/web/bean/wcm/ViewDeploymentReportDialog.java
View File

@@ -24,12 +24,18 @@
*/
package org.alfresco.web.bean.wcm;
import java.text.MessageFormat;
import java.util.Map;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.ui.common.component.UIActionLink;
import org.alfresco.web.ui.common.component.UIModeList;
import org.alfresco.web.ui.wcm.component.UIDeploymentReports;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -43,6 +49,10 @@ public class ViewDeploymentReportDialog extends BaseDialogBean
private static final long serialVersionUID = -8054466371051782132L;
protected String store;
protected NodeRef attempt;
protected String attemptDate;
protected boolean panelExpanded = false;
protected String dateFilter = UIDeploymentReports.FILTER_DATE_WEEK;
private static final Log logger = LogFactory.getLog(ViewDeploymentReportDialog.class);
@@ -55,6 +65,10 @@ public class ViewDeploymentReportDialog extends BaseDialogBean
super.init(parameters);
this.store = parameters.get("store");
this.dateFilter = UIDeploymentReports.FILTER_DATE_WEEK;
this.panelExpanded = false;
this.attempt = null;
this.attemptDate = null;
if (this.store == null || this.store.length() == 0)
{
@@ -78,14 +92,105 @@ public class ViewDeploymentReportDialog extends BaseDialogBean
return outcome;
}
@Override
public String getContainerDescription()
{
String desc = null;
if (attempt == null)
{
desc = Application.getMessage(FacesContext.getCurrentInstance(),
"deployment_report_desc");
}
else
{
desc = Application.getMessage(FacesContext.getCurrentInstance(),
"deployment_previous_report_desc");
}
return desc;
}
@Override
public String getContainerTitle()
{
String title = null;
if (attempt == null)
{
title = Application.getMessage(FacesContext.getCurrentInstance(),
"deployment_report_title");
}
else
{
String pattern = Application.getMessage(FacesContext.getCurrentInstance(),
"deployment_previous_report_title");
title = MessageFormat.format(pattern, this.attemptDate);
}
return title;
}
// ------------------------------------------------------------------------------
// Event handlers
/**
* Action handler called when the Date filter is changed by the user
*/
public void dateFilterChanged(ActionEvent event)
{
UIModeList filterComponent = (UIModeList)event.getComponent();
setDateFilter(filterComponent.getValue().toString());
}
/**
* Action handler called when a deployment attempt is selected
*/
public void attemptSelected(ActionEvent event)
{
UIActionLink link = (UIActionLink)event.getComponent();
Map<String, String> params = link.getParameterMap();
String attempt = params.get("attemptRef");
if (attempt != null && attempt.length() != 0)
{
this.attemptDate = params.get("attemptDate");
this.attempt = new NodeRef(attempt);
}
}
/**
* Action handler called when the panel is expanded or collapsed
*/
public void panelToggled(ActionEvent event)
{
this.panelExpanded = !this.panelExpanded;
}
// ------------------------------------------------------------------------------
// Bean getters and setters
/**
* @return The store to show deployment reports for
*/
public String getStore()
{
return this.store;
}
public String getDateFilter()
{
return this.dateFilter;
}
public void setDateFilter(String dateFilter)
{
this.dateFilter = dateFilter;
}
public NodeRef getAttempt()
{
return this.attempt;
}
public boolean getPanelExpanded()
{
return this.panelExpanded;
}
}

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

@@ -29,7 +29,10 @@ import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
import javax.faces.component.UIComponent;
import javax.faces.component.UIParameter;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.el.ValueBinding;
@@ -51,9 +54,12 @@ import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.wcm.DeploymentUtil;
import org.alfresco.web.ui.common.ComponentConstants;
import org.alfresco.web.ui.common.PanelGenerator;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.component.SelfRenderingComponent;
import org.alfresco.web.ui.common.component.UIActionLink;
import org.alfresco.web.ui.repo.component.UIActions;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.util.StringUtils;
@@ -65,7 +71,22 @@ import org.springframework.util.StringUtils;
*/
public class UIDeploymentReports extends SelfRenderingComponent
{
// date filters
public static final String FILTER_DATE_TODAY = "today";
public static final String FILTER_DATE_YESTERDAY = "yesterday";
public static final String FILTER_DATE_WEEK = "week";
public static final String FILTER_DATE_MONTH = "month";
public static final String FILTER_DATE_ALL = "all";
protected String store;
protected String dateFilter;
protected Boolean showPrevious;
protected NodeRef attempt;
private static final String MSG_ATTEMPT_DATE = "deploy_attempt_date";
private static final String MSG_SERVERS = "deployed_to_servers";
private static final String MSG_SNAPSHOT = "snapshot";
private static final String MSG_SELECT_ATTEMPT = "select_deploy_attempt";
private static Log logger = LogFactory.getLog(UIDeploymentReports.class);
@@ -86,14 +107,20 @@ public class UIDeploymentReports extends SelfRenderingComponent
// standard component attributes are restored by the super class
super.restoreState(context, values[0]);
this.store = (String)values[1];
this.dateFilter = (String)values[2];
this.showPrevious = (Boolean)values[3];
this.attempt = (NodeRef)values[4];
}
public Object saveState(FacesContext context)
{
Object values[] = new Object[2];
Object values[] = new Object[5];
// standard component attributes are saved by the super class
values[0] = super.saveState(context);
values[1] = this.store;
values[2] = this.dateFilter;
values[3] = this.showPrevious;
values[4] = this.attempt;
return values;
}
@@ -121,50 +148,14 @@ public class UIDeploymentReports extends SelfRenderingComponent
throw new IllegalArgumentException("The store must be specified.");
}
if (logger.isDebugEnabled())
logger.debug("Rendering deployment reports for store: " + storeName);
NodeService nodeService = Repository.getServiceRegistry(context).getNodeService();
ContentService contentService = Repository.getServiceRegistry(context).getContentService();
AVMService avmService = Repository.getServiceRegistry(context).getAVMService();
PropertyValue val = avmService.getStoreProperty(storeName, SandboxConstants.PROP_LAST_DEPLOYMENT_ID);
String attemptId = null;
if (val != null)
boolean showPrevious = getShowPrevious();
if (showPrevious)
{
attemptId = val.getStringValue();
renderPreviousReports(context, out, storeName);
}
if (attemptId == null || attemptId.length() == 0)
else
{
throw new IllegalStateException("Failed to retrieve deployment attempt id");
}
if (logger.isDebugEnabled())
logger.debug("Retrieving deployment reports for attempt id: " + attemptId);
// get the deploymentattempt object
NodeRef attempt = DeploymentUtil.findDeploymentAttempt(attemptId);
if (attempt != null)
{
// render the supporting JavaScript
out.write("<script type='text/javascript' src='");
out.write(context.getExternalContext().getRequestContextPath());
out.write("/scripts/ajax/deployment.js'></script>\n");
// iterate through each deployment report
List<ChildAssociationRef> deployReportRefs = nodeService.getChildAssocs(
attempt, WCMAppModel.ASSOC_DEPLOYMENTREPORTS, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef ref : deployReportRefs)
{
// render each report
renderReport(context, out, ref.getChildRef(), nodeService, contentService);
}
// add some padding after the panels
out.write("\n<div style='padding-top:8px;'></div>\n");
renderAttempt(context, out, storeName);
}
tx.commit();
@@ -201,10 +192,262 @@ public class UIDeploymentReports extends SelfRenderingComponent
this.store = value;
}
/**
* @return The current dateFilter if previous reports are being shown
*/
public String getDateFilter()
{
ValueBinding vb = getValueBinding("dateFilter");
if (vb != null)
{
this.dateFilter = (String)vb.getValue(getFacesContext());
}
return this.dateFilter;
}
/**
* @param value The dateFilter to use when previous reports are being shown
*/
public void setDateFilter(String value)
{
this.dateFilter = value;
}
/**
* @return true if the component should show previous reports
*/
public boolean getShowPrevious()
{
ValueBinding vb = getValueBinding("showPrevious");
if (vb != null)
{
this.showPrevious = (Boolean)vb.getValue(getFacesContext());
}
if (this.showPrevious == null)
{
this.showPrevious = Boolean.FALSE;
}
return this.showPrevious.booleanValue();
}
/**
* @param showPrevious Determines whether previous reports are shown
*/
public void setShowPrevious(boolean showPrevious)
{
this.showPrevious = new Boolean(showPrevious);
}
/**
* @return NodeRef of the deploymentattempt to show the details for
*/
public NodeRef getAttempt()
{
ValueBinding vb = getValueBinding("attempt");
if (vb != null)
{
this.attempt = (NodeRef)vb.getValue(getFacesContext());
}
return this.attempt;
}
/**
* @param value The NodeRef of the deploymentattempt to show the details for
*/
public void setAttempt(NodeRef value)
{
this.attempt = value;
}
// ------------------------------------------------------------------------------
// Helpers
private void renderReport(FacesContext context, ResponseWriter out, NodeRef deploymentReport,
@SuppressWarnings("unchecked")
protected void renderPreviousReports(FacesContext context, ResponseWriter out, String store)
throws IOException
{
NodeService nodeService = Repository.getServiceRegistry(context).getNodeService();
ResourceBundle bundle = Application.getBundle(context);
List<NodeRef> deployAttempts = null;
String dateFilter = getDateFilter();
if (logger.isDebugEnabled())
logger.debug("Rendering previous deployment reports for store '" + store +
"' using dateFilter: " + dateFilter);
if (dateFilter == null || dateFilter.equals(FILTER_DATE_ALL))
{
deployAttempts = DeploymentUtil.findDeploymentAttempts(store);
}
else
{
// get today's date
Date toDate = new Date();
// calculate the from date
Date fromDate;
if (FILTER_DATE_TODAY.equals(dateFilter))
{
fromDate = toDate;
}
else if (FILTER_DATE_YESTERDAY.equals(dateFilter))
{
fromDate = new Date(toDate.getTime() - (1000L*60L*60L*24L));
toDate = fromDate;
}
else if (FILTER_DATE_WEEK.equals(dateFilter))
{
fromDate = new Date(toDate.getTime() - (1000L*60L*60L*24L*7L));
}
else if (FILTER_DATE_MONTH.equals(dateFilter))
{
fromDate = new Date(toDate.getTime() - (1000L*60L*60L*24L*30L));
}
else
{
throw new IllegalArgumentException("Unknown date filter mode: " + dateFilter);
}
// get the filtered list of attempts
deployAttempts = DeploymentUtil.findDeploymentAttempts(store, fromDate, toDate);
}
if (deployAttempts.size() > 0)
{
out.write("<table class='deployMoreReportsList' cellspacing='3' cellpadding='3' width='100%'>");
out.write("<tr><th align='left'><nobr>");
out.write(bundle.getString(MSG_ATTEMPT_DATE));
out.write("</nobr></th><th align='left'><nobr>");
out.write(bundle.getString(MSG_SERVERS));
out.write("</nobr></th><th align='left'><nobr>");
out.write(bundle.getString(MSG_SNAPSHOT));
out.write("</th></tr>");
for (NodeRef attempt : deployAttempts)
{
Map<QName, Serializable> props = nodeService.getProperties(attempt);
String attemptId = (String)props.get(WCMAppModel.PROP_DEPLOYATTEMPTID);
Date attemptTime = (Date)props.get(WCMAppModel.PROP_DEPLOYATTEMPTTIME);
Integer version = (Integer)props.get(WCMAppModel.PROP_DEPLOYATTEMPTVERSION);
List<String> servers = (List<String>)props.get(WCMAppModel.PROP_DEPLOYATTEMPTSERVERS);
StringBuilder buffer = new StringBuilder();
if (servers != null)
{
for (String server : servers)
{
if (buffer.length() != 0)
{
buffer.append(", ");
}
buffer.append(server);
}
}
// format the date using the default pattern
String attemptDate = Utils.getDateTimeFormat(context).format(attemptTime);
out.write("<tr><td><nobr>");
Utils.encodeRecursive(context,
aquireViewAttemptAction(context, attemptId, attempt, attemptDate));
out.write("</nobr></td><td>");
out.write(buffer.toString());
out.write("</td><td>");
if (version != null)
{
out.write(version.toString());
}
out.write("</td></tr>");
}
out.write("</table>");
}
else
{
out.write("<div class='deployServersInfo'>");
out.write(Application.getMessage(context, "no_deploy_attempts"));
out.write("</div>\n");
}
}
protected void renderAttempt(FacesContext context, ResponseWriter out, String store)
throws IOException
{
// get services required
NodeService nodeService = Repository.getServiceRegistry(context).getNodeService();
ContentService contentService = Repository.getServiceRegistry(context).getContentService();
AVMService avmService = Repository.getServiceRegistry(context).getAVMService();
// get the attempt node to show (if any)
NodeRef attempt = getAttempt();
if (attempt == null)
{
if (logger.isDebugEnabled())
logger.debug("Rendering last deployment report for store: " + store);
// get the last deployment attempt id, then locate the deploymentattempt node
PropertyValue val = avmService.getStoreProperty(store, SandboxConstants.PROP_LAST_DEPLOYMENT_ID);
String attemptId = null;
if (val != null)
{
attemptId = val.getStringValue();
}
if (attemptId == null || attemptId.length() == 0)
{
throw new IllegalStateException("Failed to retrieve deployment attempt id");
}
if (logger.isDebugEnabled())
logger.debug("Retrieving deploymentattempt node with attempt id: " + attemptId);
// get the deploymentattempt object
attempt = DeploymentUtil.findDeploymentAttempt(attemptId);
}
// if we have an attempt node, render it
if (attempt != null)
{
if (logger.isDebugEnabled())
logger.debug("Rendering deployment reports for attempt: " + attempt);
// render the supporting JavaScript
out.write("<script type='text/javascript' src='");
out.write(context.getExternalContext().getRequestContextPath());
out.write("/scripts/ajax/deployment.js'></script>\n");
// iterate through each deployment report
List<ChildAssociationRef> deployReportRefs = nodeService.getChildAssocs(
attempt, WCMAppModel.ASSOC_DEPLOYMENTREPORTS, RegexQNamePattern.MATCH_ALL);
if (deployReportRefs.size() > 0)
{
for (ChildAssociationRef ref : deployReportRefs)
{
// render each report
renderReport(context, out, ref.getChildRef(), nodeService, contentService);
}
}
else
{
out.write("<div class='deployInProgress'><img src='");
out.write(context.getExternalContext().getRequestContextPath());
out.write("/images/icons/info_icon_large.gif' />&nbsp;");
out.write(Application.getMessage(context, "no_deploy_reports"));
out.write("</div>\n");
}
// add some padding after the panels
out.write("\n<div style='padding-top:12px;'></div>\n");
}
}
protected void renderReport(FacesContext context, ResponseWriter out, NodeRef deploymentReport,
NodeService nodeService, ContentService contentService)
throws IOException
{
@@ -260,6 +503,7 @@ public class UIDeploymentReports extends SelfRenderingComponent
String username = (String)serverProps.get(WCMAppModel.PROP_DEPLOYSERVERUSERNAMEUSED);
String source = (String)serverProps.get(WCMAppModel.PROP_DEPLOYSOURCEPATHUSED);
String target = (String)serverProps.get(WCMAppModel.PROP_DEPLOYSERVERTARGETUSED);
String excludes = (String)serverProps.get(WCMAppModel.PROP_DEPLOYEXCLUDESUSED);
String failReason = (String)serverProps.get(WCMAppModel.PROP_DEPLOYFAILEDREASON);
String content = "";
@@ -374,6 +618,15 @@ public class UIDeploymentReports extends SelfRenderingComponent
out.write("</div>");
}
if (excludes != null)
{
out.write("<div style='margin-top: 3px;'>");
out.write(Application.getMessage(context, "deploy_server_excludes"));
out.write(":&nbsp;");
out.write(excludes);
out.write("</div>");
}
if (target != null)
{
out.write("<div style='margin-top: 3px;'>");
@@ -416,4 +669,53 @@ public class UIDeploymentReports extends SelfRenderingComponent
PanelGenerator.generatePanelEnd(out,
context.getExternalContext().getRequestContextPath(), "lightstorm");
}
@SuppressWarnings("unchecked")
protected UIActionLink aquireViewAttemptAction(FacesContext context,
String attemptId, NodeRef attemptRef, String attemptDate)
{
UIActionLink action = null;
String actionId = "va_" + attemptId;
// try find the action as a child of this component
for (UIComponent component : (List<UIComponent>)getChildren())
{
if (actionId.equals(component.getId()))
{
action = (UIActionLink)component;
break;
}
}
if (action == null)
{
// create the action and add as a child component
javax.faces.application.Application facesApp = context.getApplication();
action = (UIActionLink)facesApp.createComponent(UIActions.COMPONENT_ACTIONLINK);
action.setId(actionId);
action.setValue(attemptDate);
action.setTooltip(Application.getMessage(context, MSG_SELECT_ATTEMPT));
action.setShowLink(true);
action.setActionListener(facesApp.createMethodBinding(
"#{DialogManager.bean.attemptSelected}", UIActions.ACTION_CLASS_ARGS));
// add attemptRef param
UIParameter param1 = (UIParameter)facesApp.createComponent(ComponentConstants.JAVAX_FACES_PARAMETER);
param1.setId(actionId + "_1");
param1.setName("attemptRef");
param1.setValue(attemptRef.toString());
action.getChildren().add(param1);
// add attemptDate param
UIParameter param2 = (UIParameter)facesApp.createComponent(ComponentConstants.JAVAX_FACES_PARAMETER);
param2.setId(actionId + "_2");
param2.setName("attemptDate");
param2.setValue(attemptDate);
action.getChildren().add(param2);
this.getChildren().add(action);
}
return action;
}
}

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

@@ -75,6 +75,7 @@ public class UIDeploymentServers extends UIInput
private static final String MSG_ALLOCATED = "deploy_server_allocated";
private static final String MSG_SOURCE = "deploy_server_source_path";
private static final String MSG_TARGET = "deploy_server_target_name";
private static final String MSG_EXCLUDES = "deploy_server_excludes";
private static final String MSG_AUTO_DEPLOY = "deploy_automatically";
private static final String MSG_EDIT = "edit_deploy_server";
private static final String MSG_DELETE = "delete_deploy_server";
@@ -189,8 +190,14 @@ public class UIDeploymentServers extends UIInput
out.write("</div>");
out.write("\n<script type='text/javascript'>");
out.write("window.onload=Alfresco.checkDeployConfigPage();");
out.write("</script>");
out.write("window.onload=Alfresco.checkDeployConfigPage();\n");
if (currentServer != null)
{
out.write("Alfresco.scrollToEditServer('");
out.write(currentServer.getId());
out.write("');\n");
}
out.write("</script>\n");
tx.commit();
}
@@ -334,7 +341,7 @@ public class UIDeploymentServers extends UIInput
out.write("</div></td></tr>");
out.write("<tr><td colspan='3'>");
out.write("<table cellpadding='0' cellspacing='0'>");
out.write("<tr><td><table cellpadding='3' cellspacing='0' class='deployConfigServerDetailsLeftCol'>");
out.write("<tr><td width='100%'><table cellpadding='3' cellspacing='0' class='deployConfigServerDetailsLeftCol'>");
out.write("<tr><td align='right'>");
out.write(bundle.getString(MSG_HOST));
out.write(":</td><td>");
@@ -389,20 +396,29 @@ public class UIDeploymentServers extends UIInput
out.write("</td></tr></table></td>");
out.write("<td valign='top'><table cellpadding='3' cellspacing='0' class='deployConfigServerDetailsRightCol'>");
out.write("<tr><td align='right'>");
out.write("<tr><td align='right'><nobr>");
out.write(bundle.getString(MSG_SOURCE));
out.write(":</td><td>");
out.write(":</nobr></td><td>");
if (server.getProperties().get(DeploymentServerConfig.PROP_SOURCE_PATH) != null)
{
out.write((String)server.getProperties().get(DeploymentServerConfig.PROP_SOURCE_PATH));
}
out.write("</td></tr>");
out.write("<tr><td align='right'><nobr>");
out.write(bundle.getString(MSG_EXCLUDES));
out.write(":</nobr></td><td>");
if (server.getProperties().get(DeploymentServerConfig.PROP_EXCLUDES) != null)
{
out.write((String)server.getProperties().get(DeploymentServerConfig.PROP_EXCLUDES));
}
out.write("</td></tr>");
if (WCMAppModel.CONSTRAINT_FILEDEPLOY.equals(server.getDeployType()))
{
out.write("<tr><td align='right'>");
out.write("<tr><td align='right'><nobr>");
out.write(bundle.getString(MSG_TARGET));
out.write(":</td><td>");
out.write(":</nobr></td><td>");
if (server.getProperties().get(DeploymentServerConfig.PROP_TARGET_NAME) != null)
{
out.write((String)server.getProperties().get(DeploymentServerConfig.PROP_TARGET_NAME));
@@ -413,9 +429,9 @@ public class UIDeploymentServers extends UIInput
if (WCMAppModel.CONSTRAINT_LIVESERVER.equals(
server.getProperties().get(DeploymentServerConfig.PROP_TYPE)))
{
out.write("<tr><td align='right'>");
out.write("<tr><td align='right'><nobr>");
out.write(bundle.getString(MSG_AUTO_DEPLOY));
out.write(":</td><td>");
out.write(":</nobr></td><td>");
if (server.getProperties().get(DeploymentServerConfig.PROP_ON_APPROVAL) != null)
{
Object obj = server.getProperties().get(DeploymentServerConfig.PROP_ON_APPROVAL);
@@ -434,9 +450,9 @@ public class UIDeploymentServers extends UIInput
if (WCMAppModel.CONSTRAINT_TESTSERVER.equals(
server.getProperties().get(DeploymentServerConfig.PROP_TYPE)))
{
out.write("<tr><td align='right'>");
out.write("<tr><td align='right'><nobr>");
out.write(bundle.getString(MSG_ALLOCATED));
out.write(":</td><td>");
out.write(":</nobr></td><td>");
if (server.getProperties().get(DeploymentServerConfig.PROP_ALLOCATED_TO) != null)
{
String allocatedToTip = (String)server.getProperties().get(
@@ -466,7 +482,14 @@ public class UIDeploymentServers extends UIInput
String contextPath = context.getExternalContext().getRequestContextPath();
ResourceBundle bundle = Application.getBundle(context);
out.write("<div class='deployConfigServer'>");
out.write("<div class='deployConfigServer'");
if (edit)
{
out.write(" id='");
out.write(server.getId());
out.write("'");
}
out.write(">");
PanelGenerator.generatePanelStart(out, contextPath, "lightstorm", "#eaeff2");
out.write("<table width='100%'><tr><td><img class='deployConfigServerIcon' src='");
out.write(contextPath);
@@ -656,6 +679,22 @@ public class UIDeploymentServers extends UIInput
Utils.encodeRecursive(context, source);
out.write("</td></tr>");
// create the excludes field
out.write("<tr><td align='right'>");
out.write(bundle.getString(MSG_EXCLUDES));
out.write(":</td><td>");
UIComponent excludes = context.getApplication().createComponent(
UIInput.COMPONENT_TYPE);
FacesHelper.setupComponentId(context, excludes, null);
excludes.getAttributes().put("styleClass", "inputField");
ValueBinding vbExcludes = context.getApplication().createValueBinding(
"#{WizardManager.bean.editedDeployServerProperties." +
DeploymentServerConfig.PROP_EXCLUDES + "}");
excludes.setValueBinding("value", vbExcludes);
this.getChildren().add(excludes);
Utils.encodeRecursive(context, excludes);
out.write("</td></tr>");
if ((edit == false && WCMAppModel.CONSTRAINT_FILEDEPLOY.equals(getAddType())) ||
(edit && WCMAppModel.CONSTRAINT_FILEDEPLOY.equals(server.getDeployType())))
{

4
source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
View File

@@ -490,7 +490,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa
if (hasAllocatedTestServer)
{
UIActionLink releaseServer = createAction(context, mainStore, username,
ACT_SANDBOX_RELEASE_SERVER, "/images/icons/deploy_server.gif",
ACT_SANDBOX_RELEASE_SERVER, "/images/icons/release_server.gif",
"#{AVMBrowseBean.releaseTestServer}", null, null, null, false);
menu.getChildren().add(releaseServer);
}
@@ -1298,7 +1298,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa
menu.getAttributes().put("itemSpacing", 4);
menu.getAttributes().put("image", "/images/icons/menu.gif");
menu.getAttributes().put("menuStyleClass", "moreActionsMenu");
menu.getAttributes().put("style", "white-space:nowrap; margin-left: 4px;");
menu.getAttributes().put("style", "white-space:nowrap; margin-left: 4px; margin-right: 6px;");
return menu;
}

24
source/java/org/alfresco/web/ui/wcm/tag/DeploymentReportsTag.java
View File

@@ -36,6 +36,9 @@ import org.alfresco.web.ui.common.tag.BaseComponentTag;
public class DeploymentReportsTag extends BaseComponentTag
{
private String value;
private String showPrevious;
private String dateFilter;
private String attempt;
/**
* @see javax.faces.webapp.UIComponentTag#getComponentType()
@@ -61,6 +64,9 @@ public class DeploymentReportsTag extends BaseComponentTag
super.setProperties(component);
setStringProperty(component, "value", this.value);
setStringProperty(component, "dateFilter", this.dateFilter);
setStringProperty(component, "attempt", this.attempt);
setBooleanProperty(component, "showPrevious", this.showPrevious);
}
/**
@@ -70,6 +76,9 @@ public class DeploymentReportsTag extends BaseComponentTag
{
super.release();
this.value = null;
this.showPrevious = null;
this.dateFilter = null;
this.attempt = null;
}
/**
@@ -81,4 +90,19 @@ public class DeploymentReportsTag extends BaseComponentTag
{
this.value = value;
}
public void setShowPrevious(String showPrevious)
{
this.showPrevious = showPrevious;
}
public void setDateFilter(String dateFilter)
{
this.dateFilter = dateFilter;
}
public void setAttempt(String attempt)
{
this.attempt = attempt;
}
}

6
source/web/WEB-INF/faces-config-beans.xml
View File

@@ -2411,10 +2411,10 @@
<managed-bean>
<description>
The bean that backs up the Verify Broken Links Task Dialog
The bean that backs up the Manage Review Task Dialog
</description>
<managed-bean-name>ManageLinkValidationTaskDialog</managed-bean-name>
<managed-bean-class>org.alfresco.web.bean.wcm.ManageLinkValidationTaskDialog</managed-bean-class>
<managed-bean-name>ManageReviewTaskDialog</managed-bean-name>
<managed-bean-class>org.alfresco.web.bean.wcm.ManageReviewTaskDialog</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>nodeService</property-name>

21
source/web/WEB-INF/wcm.tld
View File

@@ -208,6 +208,27 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>showPrevious</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description>Flag to determine whether the previous reports should be shown</description>
</attribute>
<attribute>
<name>dateFilter</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description>The date filter for reducing the number of reports displayed</description>
</attribute>
<attribute>
<name>attempt</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description>The NodeRef of the deploymentattempt to show</description>
</attribute>
</tag>
<tag>

31
source/web/css/main.css
View File

@@ -747,7 +747,7 @@ a.sidebarButtonLink, a.sidebarButtonLink:link, a.sidebarButtonLink:visited
.deployConfigServerDetailsRightCol
{
margin-left: 100px;
margin-right: 140px;
}
.deployConfigServerForm
@@ -828,6 +828,35 @@ a.sidebarButtonLink, a.sidebarButtonLink:link, a.sidebarButtonLink:visited
padding-bottom: 2px;
}
.deployInProgress
{
margin: 8px 0px 6px 6px;
}
.deployInProgress img
{
vertical-align: -14px;
}
.deployReviewTaskActions img
{
margin-left: 4px;
}
.deployMoreReportsPanel
{
margin: 10px 0px 0px 14px;
}
.deployMoreReportsList
{
background-color: #f5f5f5;
border-width: 1px;
border-style: solid;
border-color: #DDDDDD;
margin-bottom: 4px;
}
.summaryDropShadow
{
background: url(../images/parts/drop_shadow_alpha.png) no-repeat bottom right !important;

BIN
source/web/images/icons/delete_deploy_reports.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 619 B

BIN
source/web/images/icons/release_server.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 597 B

30
source/web/jsp/wcm/deployment-report.jsp
View File

@@ -32,9 +32,33 @@
<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
<%@ page isELIgnored="false" %>
<w:deploymentReports value="#{DialogManager.bean.store}" />
<w:deploymentReports value="#{DialogManager.bean.store}" attempt="#{DialogManager.bean.attempt}" />
<a:panel id="more-reports-panel" label="#{msg.more_deploy_reports}" progressive="true" styleClass="mainSubTitle"
border="innerwhite" bgcolor="white" titleBgcolor="white" expanded="#{DialogManager.bean.panelExpanded}"
expandedActionListener="#{DialogManager.bean.panelToggled}">
<h:outputText value="<div class='deployMoreReportsPanel'>" escape="false" />
<h:panelGrid id="more-reports-filter" columns="2" styleClass="deployMoreReportsList" width="100%" columnClasses=",rightHandColumn">
<h:graphicImage value="/images/icons/filter.gif" />
<a:modeList id="more-reports-filter-list" itemSpacing="2" iconColumnWidth="0" horizontal="true"
selectedLinkStyle="font-weight:bold" value="#{DialogManager.bean.dateFilter}"
actionListener="#{DialogManager.bean.dateFilterChanged}">
<a:listItem id="f1" value="today" label="#{msg.date_filter_today}" />
<a:listItem id="f2" value="yesterday" label="#{msg.date_filter_yesterday}" />
<a:listItem id="f3" value="week" label="#{msg.date_filter_week}" />
<a:listItem id="f4" value="month" label="#{msg.date_filter_month}" />
<a:listItem id="f5" value="all" label="#{msg.date_filter_all}" />
</a:modeList>
</h:panelGrid>
<w:deploymentReports id="more-reports-list" value="#{DialogManager.bean.store}" showPrevious="true"
dateFilter="#{DialogManager.bean.dateFilter}" />
<h:outputText value="</div>" escape="false" />
</a:panel>
<h:outputText value="<div style='padding-top:10px;'></div>" escape="false" />

178
source/web/jsp/wcm/manage-change-request-task-dialog.jsp Normal file
View File

@@ -0,0 +1,178 @@
<%--
* Copyright (C) 2005-2007 Alfresco Software Limited.
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* 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:
* http://www.alfresco.com/legal/licensing"
--%>
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<%@ taglib uri="/WEB-INF/wcm.tld" prefix="w" %>
<a:panel id="pooled-panel" label="#{msg.task_pooled_properties}" rendered="#{DialogManager.bean.pooledTask}"
border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
<r:propertySheetGrid id="pooled-task-props" value="#{DialogManager.bean.taskNode}" columns="1" >
<r:property id="pooled-task-owner" readOnly="true" name="owner" />
<r:association id="pooled-task-pool" readOnly="true" name="bpm:pooledActors" />
</r:propertySheetGrid>
</a:panel>
<h:outputText id="padding1" styleClass="paddingRow" value="&nbsp;" escape="false" rendered="#{DialogManager.bean.pooledTask}" />
<a:panel id="metadata-panel" label="#{msg.task_properties}"
border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
<r:propertySheetGrid id="task-props" value="#{DialogManager.bean.taskNode}"
var="taskProps" columns="1" externalConfig="true" />
</a:panel>
<h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel id="resources-panel" label="#{msg.resources}"
border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
<h:outputText value="<div>#{msg.no_resources}</div>" rendered="#{empty DialogManager.bean.resources}" />
<a:richList id="resources-list" viewMode="details" value="#{DialogManager.bean.resources}" var="r"
binding="#{DialogManager.bean.packageItemsRichList}"
styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow"
altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
initialSortColumn="name" initialSortDescending="true"
rendered="#{not empty DialogManager.bean.resources}">
<%-- Name column --%>
<a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
<f:facet name="header">
<a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
</f:facet>
<f:facet name="small-icon">
<h:panelGroup>
<a:actionLink id="col1-icon1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}"
showLink="false" styleClass="inlineAction" rendered="#{!r.deleted}" />
<h:graphicImage id="col1-icon2" title="#{r.name}" url="#{r.fileType16}" styleClass="inlineAction"
rendered="#{r.deleted}" />
</h:panelGroup>
</f:facet>
<a:actionLink id="col1-name1" value="#{r.name}" href="#{r.url}" target="new" rendered="#{!r.deleted}" />
<h:outputText id="col1-name2" value="#{r.name} [#{msg.avm_node_deleted}]" rendered="#{r.deleted}" />
<r:lockIcon id="col1-lock" value="#{r.nodeRef}" align="absmiddle" />
</a:column>
<%-- Description column --%>
<a:column id="col2" style="padding:2px;text-align:left">
<f:facet name="header">
<a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
</f:facet>
<h:outputText id="col2-txt" value="#{r.description}" />
</a:column>
<%-- Path column --%>
<a:column id="col3" style="padding:2px;text-align:left">
<f:facet name="header">
<a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
</f:facet>
<r:nodePath id="col3-path" value="#{r.path}" action="dialog:close:browse"
actionListener="#{BrowseBean.clickSpacePath}" />
</a:column>
<%-- Created Date column --%>
<a:column id="col4" style="padding:2px;text-align:left">
<f:facet name="header">
<a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
</f:facet>
<h:outputText id="col4-txt" value="#{r.created}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText>
</a:column>
<%-- Modified Date column --%>
<a:column id="col5" style="padding:2px;text-align:left">
<f:facet name="header">
<a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
</f:facet>
<h:outputText id="col5-txt" value="#{r.modified}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText>
</a:column>
<%-- Expiration Date column --%>
<a:column id="col16" style="text-align:left; white-space:nowrap">
<f:facet name="header">
<a:sortLink label="#{msg.expiration_date}" value="expirationDate" styleClass="header" />
</f:facet>
<h:outputText id="col16-date" value='#{r["wca:expirationDate"]}'>
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText>
</a:column>
<%-- Actions column --%>
<a:column id="col7" actions="true" style="padding:2px;text-align:left">
<f:facet name="header">
<h:outputText id="col7-txt" value="#{msg.actions}"/>
</f:facet>
<r:actions id="col7-actions" value="#{DialogManager.bean.packageItemActionGroup}"
context="#{r}" showLink="false" styleClass="inlineAction" />
</a:column>
<a:dataPager styleClass="pager" />
</a:richList>
<h:panelGrid id="package-actions-group" columns="1" styleClass="paddingRow">
<r:actions id="package-actions" context="#{DialogManager.bean.taskNode}"
value="#{DialogManager.bean.packageActionGroup}" />
</h:panelGrid>
<h:panelGrid id="add-item-control" columns="1" rendered="#{DialogManager.bean.itemBeingAdded}"
styleClass="selector" style="margin-top: 6px;">
<r:contentSelector id="content-picker" value="#{DialogManager.bean.itemsToAdd}" styleClass="" />
<h:panelGrid columns="2">
<h:commandButton value="#{msg.add_to_list_button}" actionListener="#{DialogManager.bean.addPackageItems}" />
<h:commandButton value="#{msg.cancel}" actionListener="#{DialogManager.bean.cancelAddPackageItems}" />
</h:panelGrid>
</h:panelGrid>
</a:panel>
<h:outputText id="padding3" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}"
border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
<r:workflowSummary id="workflow-summary" value="#{DialogManager.bean.workflowInstance}" styleClass="workflowSummary" />
<f:verbatim><div style="padding-left:9px;padding-top:8px;padding-bottom:4px"></f:verbatim>
<a:panel id="pending-submission-panel" label="#{msg.workflow_history}" progressive="true"
expanded="true" styleClass="mainSubTitle">
<r:workflowHistory id="workflow-history" value="#{DialogManager.bean.workflowInstance}" styleClass="workflowHistoryList" />
</a:panel>
<f:verbatim></div></f:verbatim>
</a:panel>
<h:outputText id="padding4" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel rendered="false" id="workflow-outline" label="#{msg.workflow_outline}" progressive="true" expanded="false"
border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
<h:graphicImage value="#{DialogManager.bean.workflowDefinitionImageUrl}"/>
</a:panel>

5
source/web/jsp/wcm/manage-review-task-dialog.jsp
View File

@@ -65,17 +65,16 @@
<a:panel id="resources-panel" label="#{msg.resources}"
border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
<h:panelGroup id="resources-actions" style="margin-left: 4px;">
<h:panelGroup id="resources-actions" styleClass="deployReviewTaskActions">
<a:actionLink id="resources-action1" value="#{msg.sandbox_deploy}" image="/images/icons/deploy.gif"
action="#{DialogManager.bean.deploy}"
rendered="#{DialogManager.bean.testServersAvailable}" />
<h:outputText id="resources-actions-padding" value="&nbsp;&nbsp;" escape="false" />
<a:actionLink id="resources-action2" value="#{msg.deployment_report_action}" image="/images/icons/deployment_report.gif"
action="#{DialogManager.bean.viewDeployReport}"
rendered="#{DialogManager.bean.deployAttempted}" />
</h:panelGroup>
<h:outputText value="#{msg.no_resources}" rendered="#{empty DialogManager.bean.resources}" />
<h:outputText value="<div>#{msg.no_resources}</div>" rendered="#{empty DialogManager.bean.resources}" />
<a:richList id="resources-list" viewMode="details" value="#{DialogManager.bean.resources}" var="r"
binding="#{DialogManager.bean.packageItemsRichList}"

10
source/web/scripts/ajax/deployment.js
View File

@@ -190,6 +190,16 @@ Alfresco.deployServerTypeChanged = function()
}
}
Alfresco.scrollToEditServer = function(serverId)
{
var serverForm = document.getElementById(serverId);
if (serverForm != null)
{
var yPos = serverForm.offsetTop;
window.scrollTo(0, yPos);
}
}
Alfresco.toggleDeploymentDetails = function(icon, server)
{
var currentState = icon.className;