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 HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:18:05 +00:00
parent 1ea3931e33
commit 124f05593e
221 changed files with 21 additions and 28579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
View File

@@ -84,7 +84,6 @@ public class StartWorkflowWizard extends BaseWizardBean
transient protected List<SelectItem> availableWorkflows;
transient private Map<String, WorkflowDefinition> workflows;
protected List<String> wcmWorkflows;
protected List<String> excludedWorkflows;
protected List<String> invitationWorkflows;
protected List<String> publishingWorkflows;
@@ -570,9 +569,6 @@ public class StartWorkflowWizard extends BaseWizardBean
this.availableWorkflows = new ArrayList<SelectItem>(4);
this.workflows = new HashMap<String, WorkflowDefinition>(4);
// get the list of configured WCM workflows and filter these from
// the list as these workflows are specific to WCM functionality and AVM stores
List<String> configuredWcmWorkflows = this.getWCMWorkflowNames();
List<String> configuredInvitationWorkflows = this.getInvitationServiceWorkflowNames();
List<String> publishingWorkflows = this.getPublishingWorkflowNames();
List<String> excludedWorkflows = this.getExcludedWorkflows();
@@ -582,8 +578,7 @@ public class StartWorkflowWizard extends BaseWizardBean
{
String name = workflowDef.name;
if (configuredWcmWorkflows.contains(name) == false &&
configuredInvitationWorkflows.contains(name) == false &&
if (configuredInvitationWorkflows.contains(name) == false &&
publishingWorkflows.contains(name) == false &&
excludedWorkflows.contains(name) == false)
{
@@ -736,63 +731,6 @@ public class StartWorkflowWizard extends BaseWizardBean
}
}
/**
* Get the Names of the WCM workflows.
*
* @return The names of the WCM workflows.
*/
protected List<String> getWCMWorkflowNames()
{
if ((wcmWorkflows == null) || (Application.isDynamicConfig(FacesContext.getCurrentInstance())))
{
FacesContext fc = FacesContext.getCurrentInstance();
ConfigElement config = Application.getConfigService(fc).getGlobalConfig().getConfigElement("wcm");
if (config != null)
{
// get the main WCM workflows
ConfigElement workflowConfig = config.getChild("workflows");
if (workflowConfig != null)
{
StringTokenizer t = new StringTokenizer(workflowConfig.getValue().trim(), ", ");
wcmWorkflows = new ArrayList<String>(t.countTokens());
while (t.hasMoreTokens())
{
String wfName = "jbpm$" + t.nextToken();
wcmWorkflows.add(wfName);
}
}
else
{
if (logger.isWarnEnabled())
logger.warn("WARNING: Unable to find WCM 'workflows' config element definition.");
}
// get the admin WCM workflows
ConfigElement adminWorkflowConfig = config.getChild("admin-workflows");
if (adminWorkflowConfig != null)
{
StringTokenizer t = new StringTokenizer(adminWorkflowConfig.getValue().trim(), ", ");
while (t.hasMoreTokens())
{
String wfName = "jbpm$" + t.nextToken();
wcmWorkflows.add(wfName);
}
}
else
{
if (logger.isWarnEnabled())
logger.warn("WARNING: Unable to find WCM 'admin-workflows' config element definition.");
}
}
else
{
logger.warn("WARNING: Unable to find 'wcm' config element definition.");
}
}
return wcmWorkflows;
}
/**
* Get the Names of globally excluded workflow-names.
*