diff --git a/source/java/org/alfresco/repo/security/person/TestGroupManager.java b/source/java/org/alfresco/repo/security/person/TestGroupManager.java index ff66642cf4..0415a9a4a8 100644 --- a/source/java/org/alfresco/repo/security/person/TestGroupManager.java +++ b/source/java/org/alfresco/repo/security/person/TestGroupManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -16,7 +16,6 @@ * You should have received a copy of the GNU Lesser General Public License * along with Alfresco. If not, see . */ - package org.alfresco.repo.security.person; import java.util.HashMap; @@ -30,7 +29,7 @@ import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.security.AuthorityType; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/AbstractWorkflowNodeConverter.java b/source/java/org/alfresco/repo/workflow/AbstractWorkflowNodeConverter.java index 1bacb03a5b..5e505dd91f 100644 --- a/source/java/org/alfresco/repo/workflow/AbstractWorkflowNodeConverter.java +++ b/source/java/org/alfresco/repo/workflow/AbstractWorkflowNodeConverter.java @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2005-2011 Alfresco Software Limited. + * + * This file is part of Alfresco + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + */ package org.alfresco.repo.workflow; import java.io.Serializable; @@ -8,6 +26,11 @@ import java.util.List; import org.alfresco.service.cmr.repository.NodeRef; +/** + * @since 3.4.e + * @author Nick Smith + * + */ public abstract class AbstractWorkflowNodeConverter implements WorkflowNodeConverter { /** diff --git a/source/java/org/alfresco/repo/workflow/AbstractWorkflowPropertyHandler.java b/source/java/org/alfresco/repo/workflow/AbstractWorkflowPropertyHandler.java index 65b4cb756a..e686870b53 100644 --- a/source/java/org/alfresco/repo/workflow/AbstractWorkflowPropertyHandler.java +++ b/source/java/org/alfresco/repo/workflow/AbstractWorkflowPropertyHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -34,7 +34,7 @@ import org.alfresco.service.cmr.workflow.WorkflowException; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/AbstractWorkflowServiceIntegrationTest.java b/source/java/org/alfresco/repo/workflow/AbstractWorkflowServiceIntegrationTest.java index b2ae805bdd..3e218a5976 100644 --- a/source/java/org/alfresco/repo/workflow/AbstractWorkflowServiceIntegrationTest.java +++ b/source/java/org/alfresco/repo/workflow/AbstractWorkflowServiceIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -59,7 +59,7 @@ import org.alfresco.util.BaseSpringTest; import org.alfresco.util.GUID; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * @author Frederik Heremans * diff --git a/source/java/org/alfresco/repo/workflow/AlfrescoBpmEngine.java b/source/java/org/alfresco/repo/workflow/AlfrescoBpmEngine.java index a871b3374f..b349c62756 100644 --- a/source/java/org/alfresco/repo/workflow/AlfrescoBpmEngine.java +++ b/source/java/org/alfresco/repo/workflow/AlfrescoBpmEngine.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -26,7 +26,7 @@ import org.alfresco.service.cmr.workflow.WorkflowException; import org.alfresco.service.namespace.NamespaceService; /** - * @since 3.5 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/DefaultWorkflowPropertyHandler.java b/source/java/org/alfresco/repo/workflow/DefaultWorkflowPropertyHandler.java index 6c36b67dc3..0a5702d979 100644 --- a/source/java/org/alfresco/repo/workflow/DefaultWorkflowPropertyHandler.java +++ b/source/java/org/alfresco/repo/workflow/DefaultWorkflowPropertyHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -25,7 +25,7 @@ import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/NodeConverter.java b/source/java/org/alfresco/repo/workflow/NodeConverter.java index 29d902ae3b..b6e3d63f15 100644 --- a/source/java/org/alfresco/repo/workflow/NodeConverter.java +++ b/source/java/org/alfresco/repo/workflow/NodeConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -25,7 +25,7 @@ import java.util.List; import org.alfresco.service.cmr.repository.NodeRef; /** - * @since 3.5 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/WorkflowAuthorityManager.java b/source/java/org/alfresco/repo/workflow/WorkflowAuthorityManager.java index 2d0afcd48c..58b57b18cd 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowAuthorityManager.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowAuthorityManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -24,7 +24,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.security.AuthorityType; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ @@ -46,7 +46,7 @@ public class WorkflowAuthorityManager */ public String mapAuthorityToName(NodeRef authority) { - return authorityDAO.getAuthorityName(authority); + return authorityDAO.getAuthorityName(authority); } /** diff --git a/source/java/org/alfresco/repo/workflow/WorkflowConstants.java b/source/java/org/alfresco/repo/workflow/WorkflowConstants.java index 0a0a27ac1d..0610491b9f 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowConstants.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowConstants.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -21,6 +21,7 @@ package org.alfresco.repo.workflow; /** * @author Frederik Heremans + * @since 3.4.e */ public interface WorkflowConstants { diff --git a/source/java/org/alfresco/repo/workflow/WorkflowEngine.java b/source/java/org/alfresco/repo/workflow/WorkflowEngine.java index 4e6d983bec..455f37b554 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowEngine.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowEngine.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -20,7 +20,7 @@ package org.alfresco.repo.workflow; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/WorkflowNodeConverter.java b/source/java/org/alfresco/repo/workflow/WorkflowNodeConverter.java index f016b82818..6a9125ffa6 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowNodeConverter.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowNodeConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -26,7 +26,7 @@ import java.util.List; import org.alfresco.service.cmr.repository.NodeRef; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith */ public interface WorkflowNodeConverter diff --git a/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java b/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java index db28736596..dbd1d855dc 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -43,7 +43,7 @@ import org.alfresco.service.cmr.workflow.WorkflowTransition; import org.alfresco.service.namespace.QName; /** - * @since 3.5 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/WorkflowPropertyConverter.java b/source/java/org/alfresco/repo/workflow/WorkflowPropertyConverter.java index 79d8f38a42..c1486e6115 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowPropertyConverter.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowPropertyConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -35,7 +35,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.QName; /** - * @since 3.5 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/WorkflowPropertyHandler.java b/source/java/org/alfresco/repo/workflow/WorkflowPropertyHandler.java index c7acb2e7e5..228165e5c9 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowPropertyHandler.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowPropertyHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -25,7 +25,7 @@ import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/WorkflowPropertyHandlerRegistry.java b/source/java/org/alfresco/repo/workflow/WorkflowPropertyHandlerRegistry.java index 4731e4fa60..c71ae7f2ca 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowPropertyHandlerRegistry.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowPropertyHandlerRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -28,7 +28,7 @@ import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java b/source/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java index 9ce8c01a3f..874240a08e 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -23,7 +23,7 @@ import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.java b/source/java/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.java index e902d7f403..4db6ffca28 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.java +++ b/source/java/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -78,7 +78,7 @@ import org.springframework.test.context.transaction.TransactionConfiguration; import org.springframework.transaction.annotation.Transactional; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * @author Frederik Heremans * diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiConstants.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiConstants.java index eb07afee47..3f14cd4bba 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiConstants.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiConstants.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -20,7 +20,7 @@ package org.alfresco.repo.workflow.activiti; /** - * @since 3.5 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiNodeConverter.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiNodeConverter.java index 147297ebb8..f557de519e 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiNodeConverter.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiNodeConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -29,7 +29,7 @@ import org.alfresco.service.cmr.repository.NodeRef; /** * @author Nick Smith - * + * @since 3.4.e */ public class ActivitiNodeConverter extends AbstractWorkflowNodeConverter { diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNode.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNode.java index 7049e7d54f..884fdc822e 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNode.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNode.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -32,6 +32,7 @@ import org.mozilla.javascript.Scriptable; * Scriptable Node suitable for Activti Beanshell access * * @author Frederik Heremans + * @since 3.4.e */ public class ActivitiScriptNode extends ScriptNode { diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNodeList.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNodeList.java index 9e6c9ff927..5a8056f138 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNodeList.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNodeList.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -28,6 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef; * List of {@link ActivitiScriptNode}s. * * @author Frederik Heremans + * @since 3.4.e */ public class ActivitiScriptNodeList extends ArrayList { diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiSmokeTest.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiSmokeTest.java index 16162dc8b7..2db1a86839 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiSmokeTest.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiSmokeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -32,7 +32,7 @@ import org.activiti.engine.runtime.ProcessInstance; import org.springframework.core.io.ClassPathResource; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTest.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTest.java index 7b74bec3fe..988cb6b91e 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTest.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -46,7 +46,7 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; /** - * @since 3.4 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTransactionTest.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTransactionTest.java index 88a4867897..f1ef630271 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTransactionTest.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTransactionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -44,7 +44,7 @@ import org.alfresco.util.ApplicationContextHelper; import org.springframework.context.ApplicationContext; /** - * @since 3.4 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java index 3bbf5b1a59..0cc16c63cd 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -51,7 +51,7 @@ import org.junit.Before; import org.junit.Test; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * @author Frederik Heremans */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskPropertyHandler.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskPropertyHandler.java index 951cd8430c..3b31100c94 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskPropertyHandler.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskPropertyHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -28,7 +28,7 @@ import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskTypeManager.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskTypeManager.java index eebcb004da..03b4d89725 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskTypeManager.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskTypeManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -30,7 +30,7 @@ import org.alfresco.repo.workflow.WorkflowObjectFactory; import org.alfresco.service.cmr.dictionary.TypeDefinition; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java index 00ed4d44db..e8d5deb240 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -55,6 +55,7 @@ import org.alfresco.util.GUID; * Test to verify timer execution autentication and transaction behaviour. * * @author Frederik Heremans + * @since 3.4.e */ public class ActivitiTimerExecutionTest extends BaseSpringTest { diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTypeConverter.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTypeConverter.java index 9fb7a6bdef..6ae3f7a890 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTypeConverter.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTypeConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -58,10 +58,10 @@ import org.alfresco.service.cmr.workflow.WorkflowTransition; import org.alfresco.service.namespace.QName; /** - * @since 3.5 + * * @author Nick Smith * @author Frederik Heremans - * + * @since 3.4.e */ public class ActivitiTypeConverter { diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiUtil.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiUtil.java index 946bf6a5eb..772acc1efe 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiUtil.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -40,7 +40,7 @@ import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowComponentTest.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowComponentTest.java index 8d4bbf1f7a..20419d8a40 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowComponentTest.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowComponentTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -62,7 +62,7 @@ import org.junit.Test; * Spring-configured JUnit 4 test case. * Uses Spring to load up a test context and runs each test case in a transaction which gets rolled back. * Loads up the activiti-context.xml and test-database-context.xml. - * @since 3.5 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java index 22c645a798..bbe87eb207 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -105,7 +105,7 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * @author Frederik Heremans * diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java index fc9999d200..51a17500ef 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -24,8 +24,8 @@ import org.alfresco.repo.workflow.WorkflowPropertyHandlerRegistry; import org.alfresco.repo.workflow.activiti.properties.ActivitiPropertyConverter; /** - * @author Nick - * + * @author Nick Smith + * @since 3.4.e */ public class ActivitiWorkflowManager { diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java index 196fb512d4..39eb3554bd 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -40,8 +40,8 @@ import org.alfresco.service.namespace.NamespaceService; import org.springframework.beans.factory.FactoryBean; /** - * @author Nick - * + * @author Nick Smith + * @since 3.4.e */ public class ActivitiWorkflowManagerFactory implements FactoryBean { diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowServiceIntegrationTest.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowServiceIntegrationTest.java index 4c9886393a..cfe0174a15 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowServiceIntegrationTest.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowServiceIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -34,7 +34,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/AddTaskListenerParseListener.java b/source/java/org/alfresco/repo/workflow/activiti/AddTaskListenerParseListener.java index 9d7a7d70f1..acc8b1ae7b 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/AddTaskListenerParseListener.java +++ b/source/java/org/alfresco/repo/workflow/activiti/AddTaskListenerParseListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -36,6 +36,7 @@ import org.activiti.engine.impl.variable.VariableDeclaration; * This is used to wire in custom logic when task is created and completed. * * @author Frederik Heremans + * @since 3.4.e */ public class AddTaskListenerParseListener implements BpmnParseListener { diff --git a/source/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java b/source/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java index 838f271b31..d7ac6b66ee 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java +++ b/source/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2005-2011 Alfresco Software Limited. + * + * This file is part of Alfresco + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + */ + package org.alfresco.repo.workflow.activiti; import java.util.List; @@ -8,6 +27,11 @@ import org.activiti.engine.impl.variable.SerializableType; import org.activiti.engine.impl.variable.VariableType; import org.activiti.spring.SpringProcessEngineConfiguration; +/** + * @since 3.4.e + * @author Nick Smith + * @author Frederik Heremans + */ public class AlfrescoProcessEngineConfiguration extends SpringProcessEngineConfiguration { private List customTypes; diff --git a/source/java/org/alfresco/repo/workflow/activiti/AuthenticatedTimerJobHandler.java b/source/java/org/alfresco/repo/workflow/activiti/AuthenticatedTimerJobHandler.java index 58d96fa3ff..8b022f98fa 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/AuthenticatedTimerJobHandler.java +++ b/source/java/org/alfresco/repo/workflow/activiti/AuthenticatedTimerJobHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -37,6 +37,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; * It wraps another JobHandler to which the actual execution is delegated to. * * @author Frederik Heremans + * @since 3.4.e */ public class AuthenticatedTimerJobHandler implements JobHandler { diff --git a/source/java/org/alfresco/repo/workflow/activiti/listener/ScriptExecutionListener.java b/source/java/org/alfresco/repo/workflow/activiti/listener/ScriptExecutionListener.java index d1b53eeefa..68c67696b5 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/listener/ScriptExecutionListener.java +++ b/source/java/org/alfresco/repo/workflow/activiti/listener/ScriptExecutionListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -36,6 +36,12 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.NamespaceService; +/** + * + * @author Nick Smith + * @author Frederik Heremans + * @since 3.4.e + */ public class ScriptExecutionListener extends ActivitiScriptBase implements ExecutionListener { private static final String DELETED_FLAG = "deleted"; diff --git a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDescriptionPropertyHandler.java b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDescriptionPropertyHandler.java index de3ac6d9cd..975324498a 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDescriptionPropertyHandler.java +++ b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDescriptionPropertyHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -29,7 +29,7 @@ import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiOwnerPropertyHandler.java b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiOwnerPropertyHandler.java index e1188f8511..e208c056c7 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiOwnerPropertyHandler.java +++ b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiOwnerPropertyHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -29,7 +29,7 @@ import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPackagePropertyHandler.java b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPackagePropertyHandler.java index 6558ce9b7d..2a49020c34 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPackagePropertyHandler.java +++ b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPackagePropertyHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -31,7 +31,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java index d1e31af19b..cfe000bc7d 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java +++ b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -41,7 +41,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java index e4a8603020..9bad185488 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java +++ b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -29,7 +29,7 @@ import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.namespace.QName; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java index 6db8170807..e43c428f41 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java +++ b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -68,7 +68,7 @@ import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; /** - * @since 4.0 + * @since 3.4.e * @author Nick Smith * */ diff --git a/source/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java b/source/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java index 693117ae7e..2106185128 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java +++ b/source/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -39,6 +39,7 @@ import org.alfresco.service.cmr.workflow.WorkflowException; * activiti workflow. * * @author Frederik Heremans + * @since 3.4.e */ public class ActivitiScriptBase { diff --git a/source/java/org/alfresco/repo/workflow/activiti/tasklistener/ScriptTaskListener.java b/source/java/org/alfresco/repo/workflow/activiti/tasklistener/ScriptTaskListener.java index 49c1340f44..830b0d530c 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/tasklistener/ScriptTaskListener.java +++ b/source/java/org/alfresco/repo/workflow/activiti/tasklistener/ScriptTaskListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -37,6 +37,7 @@ import org.alfresco.service.cmr.repository.NodeRef; * using scripting-language specified by 'language' * * @author Frederik Heremans + * @since 3.4.e */ public class ScriptTaskListener extends ActivitiScriptBase implements TaskListener { diff --git a/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCompleteListener.java b/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCompleteListener.java index 0e45f1a239..cb23755e52 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCompleteListener.java +++ b/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCompleteListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -43,6 +43,7 @@ import org.alfresco.service.namespace.NamespaceService; * and preparing it for historic usage. * * @author Frederik Heremans + * @since 3.4.e */ public class TaskCompleteListener implements TaskListener { diff --git a/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java b/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java index 219b2d0e2e..766db7ecde 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java +++ b/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -32,6 +32,7 @@ import org.alfresco.repo.workflow.activiti.properties.ActivitiPropertyConverter; * default properties for this task. * * @author Frederik Heremans + * @since 3.4.e */ public class TaskCreateListener implements TaskListener { diff --git a/source/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeListVariableType.java b/source/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeListVariableType.java index 4ee2dc6f96..e6faa6f667 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeListVariableType.java +++ b/source/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeListVariableType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -35,6 +35,7 @@ import org.alfresco.service.cmr.repository.NodeRef; * a process variable in activiti. * * @author Frederik Heremans + * @since 3.4.e */ public class ScriptNodeListVariableType extends SerializableType { diff --git a/source/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeVariableType.java b/source/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeVariableType.java index 52576cea66..067f3b9349 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeVariableType.java +++ b/source/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeVariableType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -33,6 +33,7 @@ import org.alfresco.service.cmr.repository.NodeRef; * scripts. * * @author Frederik Heremans + * @since 3.4.e */ public class ScriptNodeVariableType implements VariableType { diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JbpmWorkflowServiceIntegrationTest.java b/source/java/org/alfresco/repo/workflow/jbpm/JbpmWorkflowServiceIntegrationTest.java index 03c43f1e90..f066fb0647 100644 --- a/source/java/org/alfresco/repo/workflow/jbpm/JbpmWorkflowServiceIntegrationTest.java +++ b/source/java/org/alfresco/repo/workflow/jbpm/JbpmWorkflowServiceIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2011 Alfresco Software Limited. * * This file is part of Alfresco * @@ -22,12 +22,11 @@ import org.alfresco.repo.workflow.AbstractWorkflowServiceIntegrationTest; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; - - /** - * Workflow Service Implementation Tests + * JBPM Workflow Service Implementation Tests * - * @author davidc + * @author Nick Smith + * @since 3.4.e */ public class JbpmWorkflowServiceIntegrationTest extends AbstractWorkflowServiceIntegrationTest { @@ -63,7 +62,8 @@ public class JbpmWorkflowServiceIntegrationTest extends AbstractWorkflowServiceI } @Override - protected QName getAdhocProcessName() { + protected QName getAdhocProcessName() + { return QName.createQName(NamespaceService.WORKFLOW_MODEL_1_0_URI, "adhoc"); } }