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

Consolidate/fix bootstrap import (MT & ST) of repo-sourced workflow defs

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8087 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-01-24 16:10:35 +00:00
parent f3b4ed76dd
commit d27f0b557e
10 changed files with 207 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
source/java/org/alfresco/repo/workflow/WorkflowDefinitionType.java
View File

@@ -25,23 +25,15 @@
package org.alfresco.repo.workflow;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.ContentServicePolicies;
import org.alfresco.repo.node.NodeServicePolicies;
import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.workflow.WorkflowDefinition;
import org.alfresco.service.cmr.workflow.WorkflowDeployment;
import org.alfresco.service.cmr.workflow.WorkflowService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Workflow Definition type behaviour.
@@ -52,29 +44,11 @@ public class WorkflowDefinitionType implements ContentServicePolicies.OnContentU
NodeServicePolicies.OnUpdatePropertiesPolicy,
NodeServicePolicies.BeforeDeleteNodePolicy
{
// logger
private static Log logger = LogFactory.getLog(WorkflowDefinitionType.class);
/** The node service */
private NodeService nodeService;
/** The policy component */
private PolicyComponent policyComponent;
/** The workflow service */
private WorkflowService workflowService;
/**
* Set the node service
*
* @param nodeService the node service
*/
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
/** The workflow deployer / undeployer */
private WorkflowDeployer workflowDeployer;
/**
* Set the policy component
@@ -87,16 +61,15 @@ public class WorkflowDefinitionType implements ContentServicePolicies.OnContentU
}
/**
* Set the workflow service
* Set the workflow deployer / undeployer
*
* @param workflowService the workflow service
* @param workflowDeployer the workflow deployer / undeployer
*/
public void setWorkflowService(WorkflowService workflowService)
public void setWorkflowDeployer(WorkflowDeployer workflowDeployer)
{
this.workflowService = workflowService;
this.workflowDeployer = workflowDeployer;
}
/**
* The initialise method
*/
@@ -128,7 +101,7 @@ public class WorkflowDefinitionType implements ContentServicePolicies.OnContentU
*/
public void onContentUpdate(NodeRef nodeRef, boolean newContent)
{
deploy(nodeRef);
workflowDeployer.deploy(nodeRef, true);
}
/**
@@ -151,78 +124,23 @@ public class WorkflowDefinitionType implements ContentServicePolicies.OnContentU
{
if (afterValue.booleanValue() == true)
{
deploy(nodeRef);
workflowDeployer.deploy(nodeRef, true);
}
else
{
undeploy(nodeRef);
workflowDeployer.undeploy(nodeRef);
}
}
else if (afterValue == null && beforeValue != null)
{
// Undeploy the definition since the value has been cleared
undeploy(nodeRef);
workflowDeployer.undeploy(nodeRef);
}
}
public void beforeDeleteNode(NodeRef nodeRef)
{
undeploy(nodeRef);
}
public void deploy(NodeRef nodeRef)
{
// Ignore if the node is a working copy
if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY) == false)
{
Boolean value = (Boolean)nodeService.getProperty(nodeRef, WorkflowModel.PROP_WORKFLOW_DEF_DEPLOYED);
if ((value != null) && (value.booleanValue() == true))
{
// deploy / re-deploy
WorkflowDeployment deployment = workflowService.deployDefinition(nodeRef);
if (deployment != null)
{
WorkflowDefinition def = deployment.definition;
// Update the meta data for the model
Map<QName, Serializable> props = nodeService.getProperties(nodeRef);
props.put(WorkflowModel.PROP_WORKFLOW_DEF_NAME, def.getName());
// TODO - ability to return and handle deployment problems / warnings
if (deployment.problems.length > 0)
{
for (String problem : deployment.problems)
{
logger.warn(problem);
}
}
nodeService.setProperties(nodeRef, props);
}
}
}
}
private void undeploy(NodeRef nodeRef)
{
// Ignore if the node is a working copy
if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY) == false)
{
String defName = (String)nodeService.getProperty(nodeRef, WorkflowModel.PROP_WORKFLOW_DEF_NAME);
if (defName != null)
{
// Undeploy the workflow definition - all versions in JBPM
List<WorkflowDefinition> defs = workflowService.getAllDefinitionsByName(defName);
for (WorkflowDefinition def: defs)
{
logger.info("Undeploying workflow '" + defName + "' ...");
workflowService.undeployDefinition(def.getId());
logger.info("... undeployed '" + def.getId() + "' v" + def.getVersion());
}
}
}
workflowDeployer.undeploy(nodeRef);
}
}

144
source/java/org/alfresco/repo/workflow/WorkflowDeployer.java
View File

@@ -24,23 +24,34 @@
*/
package org.alfresco.repo.workflow;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import javax.transaction.UserTransaction;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.dictionary.DictionaryBootstrap;
import org.alfresco.repo.dictionary.DictionaryDAO;
import org.alfresco.repo.dictionary.RepositoryLocation;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.view.ImporterException;
import org.alfresco.service.cmr.workflow.WorkflowDefinition;
import org.alfresco.service.cmr.workflow.WorkflowDeployment;
import org.alfresco.service.cmr.workflow.WorkflowException;
import org.alfresco.service.cmr.workflow.WorkflowService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.AbstractLifecycleBean;
import org.apache.commons.logging.Log;
@@ -75,7 +86,14 @@ public class WorkflowDeployer extends AbstractLifecycleBean
private List<String> models = new ArrayList<String>();
private List<String> resourceBundles = new ArrayList<String>();
private TenantService tenantService;
private NodeService nodeService;
private NamespaceService namespaceService;
private SearchService searchService;
private RepositoryLocation repoWorkflowDefsLocation;
public final static String CRITERIA_ALL = "/*"; // immediate children only
public final static String defaultSubtypeOfWorkflowDefinitionType = "subtypeOf('bpm:workflowDefinition')";
/**
* Set whether we write or not
@@ -172,6 +190,28 @@ public class WorkflowDeployer extends AbstractLifecycleBean
{
return this.workflowDefinitions;
}
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
public void setSearchService(SearchService searchService)
{
this.searchService = searchService;
}
public void setNamespaceService(NamespaceService namespaceService)
{
this.namespaceService = namespaceService;
}
public void setRepositoryWorkflowDefsLocations(RepositoryLocation repoWorkflowDefsLocation)
{
this.repoWorkflowDefsLocation = repoWorkflowDefsLocation;
}
/**
* Deploy the Workflow Definitions
@@ -258,6 +298,22 @@ public class WorkflowDeployer extends AbstractLifecycleBean
}
}
}
// deploy workflow definitions from repository (if any)
if (repoWorkflowDefsLocation != null)
{
StoreRef storeRef = repoWorkflowDefsLocation.getStoreRef();
NodeRef rootNode = nodeService.getRootNode(storeRef);
List<NodeRef> nodeRefs = searchService.selectNodes(rootNode, repoWorkflowDefsLocation.getPath()+CRITERIA_ALL+"["+defaultSubtypeOfWorkflowDefinitionType+"]", null, namespaceService, false);
if (nodeRefs.size() > 0)
{
for (NodeRef nodeRef : nodeRefs)
{
deploy(nodeRef, false);
}
}
}
userTransaction.commit();
}
@@ -276,6 +332,94 @@ public class WorkflowDeployer extends AbstractLifecycleBean
}
}
public void deploy(NodeRef nodeRef, boolean redeploy)
{
// Ignore if the node is a working copy
if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY) == false)
{
Boolean value = (Boolean)nodeService.getProperty(nodeRef, WorkflowModel.PROP_WORKFLOW_DEF_DEPLOYED);
if ((value != null) && (value.booleanValue() == true))
{
if (!redeploy && workflowService.isDefinitionDeployed(nodeRef))
{
if (logger.isDebugEnabled())
{
logger.debug("Workflow deployer: Definition '" + nodeRef + "' already deployed");
}
}
else
{
// deploy / re-deploy
WorkflowDeployment deployment = workflowService.deployDefinition(nodeRef);
if (logger.isInfoEnabled())
{
logger.info("Workflow deployer: Deployed process definition '" + deployment.definition.title + "' (version " + deployment.definition.version + ") from '" + nodeRef + "' with " + deployment.problems.length + " problems");
}
if (deployment != null)
{
WorkflowDefinition def = deployment.definition;
// Update the meta data for the model
Map<QName, Serializable> props = nodeService.getProperties(nodeRef);
props.put(WorkflowModel.PROP_WORKFLOW_DEF_NAME, def.getName());
// TODO - ability to return and handle deployment problems / warnings
if (deployment.problems.length > 0)
{
for (String problem : deployment.problems)
{
logger.warn(problem);
}
}
nodeService.setProperties(nodeRef, props);
}
}
}
}
else
{
if (logger.isDebugEnabled())
{
logger.debug("Workflow deployer: Definition '" + nodeRef + "' not deployed since it is a working copy");
}
}
}
public void undeploy(NodeRef nodeRef)
{
// Ignore if the node is a working copy
if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY) == false)
{
String defName = (String)nodeService.getProperty(nodeRef, WorkflowModel.PROP_WORKFLOW_DEF_NAME);
if (defName != null)
{
// Undeploy the workflow definition - all versions in JBPM
List<WorkflowDefinition> defs = workflowService.getAllDefinitionsByName(defName);
for (WorkflowDefinition def: defs)
{
if (logger.isInfoEnabled())
{
logger.info("Undeploying workflow '" + defName + "' ...");
}
workflowService.undeployDefinition(def.getId());
if (logger.isInfoEnabled())
{
logger.info("... undeployed '" + def.getId() + "' v" + def.getVersion());
}
}
}
}
else
{
if (logger.isDebugEnabled())
{
logger.debug("Workflow deployer: Definition '" + nodeRef + "' not undeployed since it is a working copy");
}
}
}
@Override
protected void onBootstrap(ApplicationEvent event)
{

16
source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
View File

@@ -143,7 +143,23 @@ public class WorkflowServiceImpl implements WorkflowService
return deployment;
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.workflow.WorkflowService#isDefinitionDeployed(org.alfresco.service.cmr.repository.NodeRef)
*/
public boolean isDefinitionDeployed(NodeRef workflowDefinition)
{
if (! nodeService.getType(workflowDefinition).equals(WorkflowModel.TYPE_WORKFLOW_DEF))
{
throw new WorkflowException("Node " + workflowDefinition + " is not of type 'bpm:workflowDefinition'");
}
String engineId = (String)nodeService.getProperty(workflowDefinition, WorkflowModel.PROP_WORKFLOW_DEF_ENGINE_ID);
ContentReader contentReader = contentService.getReader(workflowDefinition, ContentModel.PROP_CONTENT);
return isDefinitionDeployed(engineId, contentReader.getContentInputStream(), contentReader.getMimetype());
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.workflow.WorkflowService#isDefinitionDeployed(java.lang.String, java.io.InputStream, java.lang.String)
*/