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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/workflow/jbpm/AlfrescoAssignment.java
View File

@@ -237,7 +237,8 @@ public class AlfrescoAssignment extends JBPMSpringAssignmentHandler
/**
* Convert Alfresco authority to actor id
*
* @param authority
* @param authority ScriptNode
* @param allowGroup boolean
* @return actor id
*/
private String mapAuthorityToName(ScriptNode authority, boolean allowGroup)

8
source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJavaScript.java
View File

@@ -241,7 +241,7 @@ public class AlfrescoJavaScript extends JBPMSpringActionHandler
/**
* Is the script specified as text only, or as explicit expression, variable elements
* @return
* @return boolean
*/
@SuppressWarnings("unchecked")
private boolean isScriptOnlyText()
@@ -282,9 +282,9 @@ public class AlfrescoJavaScript extends JBPMSpringActionHandler
/**
* Convert values for JBPM Context
*
* @param value
* @param services
* @return
* @param value Object
* @param services ServiceRegistry
* @return Object
*/
@SuppressWarnings("unchecked")
private static Object convertForJBPM(Object value, ServiceRegistry services)

2
source/java/org/alfresco/repo/workflow/jbpm/AlfrescoTimer.java
View File

@@ -48,7 +48,7 @@ public class AlfrescoTimer extends Timer
/**
* Construct
*
* @param token
* @param token Token
*/
public AlfrescoTimer(Token token)
{

9
source/java/org/alfresco/repo/workflow/jbpm/ForEachFork.java
View File

@@ -60,7 +60,7 @@ public class ForEachFork extends JBPMSpringActionHandler
/**
* Create a new child token for each item in list.
*
* @param executionContext
* @param executionContext ExecutionContext
* @throws Exception
*/
public void execute(final ExecutionContext executionContext)
@@ -194,9 +194,10 @@ public class ForEachFork extends JBPMSpringActionHandler
/**
* Create a token name
*
* @param parent
* @param transitionName
* @return
* @param parent Token
* @param transitionName String
* @param loopIndex int
* @return String
*/
protected String getTokenName(Token parent, String transitionName, int loopIndex)
{

197
source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
View File

@@ -216,21 +216,21 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
private static final String ERR_GET_COMPANY_HOME_INVALID = "jbpm.engine.get.company.home.invalid";
private static final String ERR_GET_COMPANY_HOME_MULTIPLE = "jbpm.engine.get.company.home.multiple";
// engine ID
public static final String ENGINE_ID = "jbpm";
public JBPMEngine()
{
super();
ignoredProperties.put(WorkflowModel.PROP_STATUS.getLocalName(), WorkflowModel.PROP_STATUS);
ignoredProperties.put(WorkflowModel.PROP_PACKAGE_ITEM_ACTION_GROUP.getLocalName(), WorkflowModel.PROP_PACKAGE_ITEM_ACTION_GROUP);
ignoredProperties.put(WorkflowModel.PROP_PACKAGE_ACTION_GROUP.getLocalName(), WorkflowModel.PROP_PACKAGE_ACTION_GROUP);
}
/**
* Sets the JBPM Template used for accessing JBoss JBPM in the correct
* context
// engine ID
public static final String ENGINE_ID = "jbpm";
public JBPMEngine()
{
super();
ignoredProperties.put(WorkflowModel.PROP_STATUS.getLocalName(), WorkflowModel.PROP_STATUS);
ignoredProperties.put(WorkflowModel.PROP_PACKAGE_ITEM_ACTION_GROUP.getLocalName(), WorkflowModel.PROP_PACKAGE_ITEM_ACTION_GROUP);
ignoredProperties.put(WorkflowModel.PROP_PACKAGE_ACTION_GROUP.getLocalName(), WorkflowModel.PROP_PACKAGE_ACTION_GROUP);
}
/**
* Sets the JBPM Template used for accessing JBoss JBPM in the correct
* context
*
* @param jbpmTemplate
* @param jbpmTemplate JbpmTemplate
*/
public void setJBPMTemplate(JbpmTemplate jbpmTemplate)
{
@@ -240,7 +240,7 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Sets the Node Service
*
* @param nodeService
* @param nodeService NodeService
*/
public void setNodeService(NodeService nodeService)
{
@@ -250,7 +250,7 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Sets the Person Service
*
* @param personService
* @param personService PersonService
*/
public void setPersonService(PersonService personService)
{
@@ -260,7 +260,7 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Sets the Authority DAO
*
* @param authorityDAO
* @param authorityDAO AuthorityDAO
*/
public void setAuthorityDAO(AuthorityDAO authorityDAO)
{
@@ -270,7 +270,7 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Sets the Service Registry
*
* @param serviceRegistry
* @param serviceRegistry ServiceRegistry
*/
public void setServiceRegistry(ServiceRegistry serviceRegistry)
{
@@ -280,7 +280,7 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Sets the Company Home Path
*
* @param companyHomePath
* @param companyHomePath String
*/
public void setCompanyHomePath(String companyHomePath)
{
@@ -290,7 +290,7 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Sets the Company Home Store
*
* @param companyHomeStore
* @param companyHomeStore String
*/
public void setCompanyHomeStore(String companyHomeStore)
{
@@ -302,7 +302,7 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
* company home when folk do not have read access to company home TODO:
* review use with DC
*
* @param unprotectedSearchService
* @param unprotectedSearchService SearchService
*/
public void setUnprotectedSearchService(SearchService unprotectedSearchService)
{
@@ -321,13 +321,13 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
return deployDefinition(workflowDefinition, mimetype, null);
}
/*
* @see org.alfresco.repo.workflow.WorkflowComponent#deployDefinition(java.io.InputStream, java.lang.String, java.lang.String)
*/
public WorkflowDeployment deployDefinition(final InputStream workflowDefinition, final String mimetype, String name)
{
try
{
/*
* @see org.alfresco.repo.workflow.WorkflowComponent#deployDefinition(java.io.InputStream, java.lang.String, java.lang.String)
*/
public WorkflowDeployment deployDefinition(final InputStream workflowDefinition, final String mimetype, String name)
{
try
{
return (WorkflowDeployment)jbpmTemplate.execute(new JbpmCallback()
{
public Object doInJbpm(JbpmContext context)
@@ -2041,8 +2041,8 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Construct a JBPM Hibernate query based on the Task Query provided
*
* @param session
* @param query
* @param session Session
* @param query WorkflowTaskQuery
* @return jbpm hiberate query criteria
*/
private Criteria createTaskQueryCriteria(Session session, WorkflowTaskQuery query)
@@ -2207,8 +2207,8 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
}
/**
* @param variables
* @return
* @param variables Criteria
* @return Disjunction
*/
private Disjunction createProcessIdCriteria(Criteria variables)
{
@@ -2264,9 +2264,9 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Create process-specific query criteria
*
* @param root
* @param query
* @return
* @param root Criteria
* @param query WorkflowTaskQuery
* @return Criteria
*/
private Criteria createProcessCriteria(Criteria root, WorkflowTaskQuery query)
{
@@ -2722,13 +2722,13 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Construct a Process Definition from the provided Process Definition
* stream
*
* @param definitionStream
* stream to create process definition from
* @param mimetype
* mimetype of stream
* Construct a Process Definition from the provided Process Definition
* stream
*
* @param definitionStream
* stream to create process definition from
* @param mimetype
* mimetype of stream
* @return process definition
*/
@SuppressWarnings("unchecked")
@@ -2855,24 +2855,24 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
}
/**
* Gets Properties of Task
*
* @param instance task instance
* @param localProperties properties to set
*/
protected Map<QName, Serializable> getTaskProperties(TaskInstance instance, boolean localProperties)
{
* Gets Properties of Task
*
* @param instance task instance
* @param localProperties properties to set
*/
protected Map<QName, Serializable> getTaskProperties(TaskInstance instance, boolean localProperties)
{
return getTaskProperties(instance, localProperties, null);
}
/**
* Gets Properties of Task
*
* @param instance task instance
* @param localProperties properties to set
* @param variablesCache cahce of context instance variables if any exists
*/
@SuppressWarnings("unchecked")
* Gets Properties of Task
*
* @param instance task instance
* @param localProperties properties to set
* @param variablesCache cahce of context instance variables if any exists
*/
@SuppressWarnings("unchecked")
protected Map<QName, Serializable> getTaskProperties(TaskInstance instance, boolean localProperties, Map<Long, TokenVariableMap> variablesCache)
{
// retrieve type definition for task
@@ -3180,13 +3180,13 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
*
* @param instance
* task instance
*/
protected void setDefaultTaskProperties(TaskInstance instance)
{
Map<QName, Serializable> existingValues = getTaskProperties(instance, false);
Map<QName, Serializable> defaultValues = new HashMap<QName, Serializable>();
// construct an anonymous type that flattens all mandatory aspects
*/
protected void setDefaultTaskProperties(TaskInstance instance)
{
Map<QName, Serializable> existingValues = getTaskProperties(instance, false);
Map<QName, Serializable> defaultValues = new HashMap<QName, Serializable>();
// construct an anonymous type that flattens all mandatory aspects
ClassDefinition classDef = getFullTaskDefinition(instance);
Map<QName, PropertyDefinition> propertyDefs = classDef.getProperties();
@@ -3361,7 +3361,7 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
* Attempts to convert a JBPM Object to the correct Alfresco data type
* @param propDef PropertyDefinition
* @param value any Value
* @return
* @return Serializable
*/
private Serializable convertValue(PropertyDefinition propDef, Object value)
{
@@ -3463,13 +3463,13 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
return value;
}
/**
* Convert person name to an Alfresco Person
*
* @param name
* the person name to convert
* @return the Alfresco person
*/
/**
* Convert person name to an Alfresco Person
*
* @param name
* the person name to convert
* @return the Alfresco person
*/
private NodeRef mapNameToPerson(String name)
{
NodeRef authority = null;
@@ -3484,13 +3484,13 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
return authority;
}
/**
* Convert authority name to an Alfresco Authority
*
* @param name
* the authority names to convert
* @return the Alfresco authorities
*/
/**
* Convert authority name to an Alfresco Authority
*
* @param name
* the authority names to convert
* @return the Alfresco authorities
*/
private NodeRef mapNameToAuthority(String name)
{
NodeRef authority = null;
@@ -3508,7 +3508,7 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Convert Alfresco authority to actor id
*
* @param authority
* @param authority NodeRef
* @return actor id
*/
private String mapAuthorityToName(NodeRef authority)
@@ -3586,12 +3586,12 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Creates a Workflow Path
*
* @param token
* JBoss JBPM Token
* @return Workflow Path
*/
protected WorkflowPath createWorkflowPath(Token token)
*
* @param token
* JBoss JBPM Token
* @return Workflow Path
*/
protected WorkflowPath createWorkflowPath(Token token)
{
if(token == null)
return null;
@@ -3605,8 +3605,8 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
*
* @param token
* JBoss JBPM Token
* @param wfInstance
* @param node
* @param wfInstance WorkflowInstance
* @param node WorkflowNode
* @return Workflow Path
*/
protected WorkflowPath createWorkflowPath(Token token, WorkflowInstance wfInstance, WorkflowNode node)
@@ -3703,8 +3703,9 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
*
* @param instance
* JBoss JBPM Process Instance
* @param endDate
* @param variables
* @param definition WorkflowDefinition
* @param endDate Date
* @param variables Map<String, Object>
* @return Workflow instance
*/
protected WorkflowInstance createWorkflowInstance(ProcessInstance instance, WorkflowDefinition definition, Date endDate, Map<String, Object> variables)
@@ -3757,8 +3758,8 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* * Creates a Workflow Task
* @param task
* @return
* @param task TaskInstance
* @return WorkflowTask
*/
protected WorkflowTask createWorkflowTask(TaskInstance task)
{
@@ -3770,13 +3771,13 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
/**
* Creates a Workflow Task
*
* @param task
* JBoss Task Instance
* @param definition task definition
* @param path
* @param properties
* @return Workflow Task
*
* @param task
* JBoss Task Instance
* @param definition task definition
* @param path WorkflowPath
* @param properties Map<QName, Serializable>
* @return Workflow Task
*/
private WorkflowTask createWorkflowTask(TaskInstance task, WorkflowTaskDefinition definition, WorkflowPath path, Map<QName, Serializable> properties)
{

2
source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java
View File

@@ -38,7 +38,7 @@ public class JBPMScheduler extends AbstractLifecycleBean
private boolean JbpmEngineEnabled = false;
/**
* @param jbpmTemplate
* @param jbpmTemplate JbpmTemplate
*/
public void setJBPMTemplate(JbpmTemplate jbpmTemplate)
{

2
source/java/org/alfresco/repo/workflow/jbpm/JBPMTestSpringActionHandler.java
View File

@@ -38,7 +38,7 @@ public class JBPMTestSpringActionHandler extends JBPMSpringActionHandler
/**
* Setter accessible from jBPM jPDL
* @param value
* @param value String
*/
public void setValue(String value)
{

8
source/java/org/alfresco/repo/workflow/jbpm/JoinEndForkedTokens.java
View File

@@ -60,8 +60,8 @@ public class JoinEndForkedTokens implements ActionHandler
/**
* Cancel token
*
* @param executionContext
* @param token
* @param executionContext ExecutionContext
* @param token Token
*/
protected void cancelToken(ExecutionContext executionContext, Token token)
{
@@ -85,8 +85,8 @@ public class JoinEndForkedTokens implements ActionHandler
/**
* Cancel tasks associated with a token
*
* @param executionContext
* @param token
* @param executionContext ExecutionContext
* @param token Token
*/
protected void cancelTokenTasks(ExecutionContext executionContext, Token token)
{

2
source/java/org/alfresco/repo/workflow/jbpm/NodeListConverter.java
View File

@@ -108,7 +108,7 @@ public class NodeListConverter extends SerializableToByteArrayConverter
/**
* @param value Object
* @return
* @return JBPMNodeList
*/
@SuppressWarnings("unchecked")
private JBPMNodeList revertNodes(Object value)

4
source/java/org/alfresco/repo/workflow/jbpm/WorkflowTaskInstance.java
View File

@@ -62,8 +62,8 @@ public class WorkflowTaskInstance extends TaskInstance
/**
* Construct
*
* @param taskName
* @param actorId
* @param taskName String
* @param actorId String
*/
public WorkflowTaskInstance(String taskName, String actorId)
{