diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 8835867415..e00aaeb44c 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -172,6 +172,7 @@
+
diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml
index 8dc90d0580..85bb316799 100644
--- a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml
+++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml
@@ -1,5 +1,5 @@
-
+
@@ -36,6 +36,11 @@
true
false
+
+ tinyint
+ true
+ false
+
@@ -491,46 +496,56 @@
false
false
-
- varchar(255)
- true
- false
-
-
- varchar(255)
- true
- false
-
-
- varchar(255)
- true
- false
-
-
+
int
true
false
-
+
+ varchar(255)
+ true
+ false
+
+
+ varchar(255)
+ true
+ false
+
+
+ varchar(255)
+ true
+ false
+
+
+ int
+ true
+ false
+
+
varchar(64)
true
false
-
+
varchar(4000)
true
false
-
+
varchar(4000)
true
false
-
+
tinyint
true
false
+
+ int
+ true
+ false
+
@@ -538,7 +553,87 @@
-
+
+
+
+ KEY_
+ VERSION_
+
+
+
+
+
+
+
+ varchar(64)
+ false
+ false
+
+
+ int
+ true
+ false
+
+
+ varchar(255)
+ false
+ false
+
+
+ varchar(255)
+ true
+ false
+
+
+ varchar(64)
+ true
+ false
+
+
+ varchar(64)
+ true
+ false
+
+
+ varchar(64)
+ true
+ false
+
+
+ varchar(255)
+ true
+ false
+
+
+ timestamp
+ false
+ false
+
+
+
+
+ ID_
+
+
+
+
+ EXECUTION_ID_
+ act_ru_execution
+ ID_
+
+
+
+
+
+ CONFIGURATION_
+
+
+
+
+ EXECUTION_ID_
+
+
+
@@ -597,6 +692,21 @@
true
false
+
+ tinyint
+ true
+ false
+
+
+ int
+ true
+ false
+
+
+ int
+ true
+ false
+
@@ -681,6 +791,11 @@
true
false
+
+ varchar(64)
+ true
+ false
+
@@ -688,6 +803,11 @@
+
+ PROC_DEF_ID_
+ act_re_procdef
+ ID_
+
TASK_ID_
ACT_RU_TASK
@@ -705,6 +825,11 @@
GROUP_ID_
+
+
+ PROC_DEF_ID_
+
+
TASK_ID_
@@ -1287,6 +1412,11 @@
true
false
+
+ varchar(4000)
+ true
+ false
+
diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml
index 1cf720996b..a13e6be1ab 100644
--- a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml
+++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml
@@ -1,5 +1,5 @@
-
+
@@ -36,6 +36,11 @@
true
false
+
+ bool
+ true
+ false
+
@@ -446,6 +451,11 @@
true
false
+
+ varchar(4000)
+ true
+ false
+
@@ -773,46 +783,56 @@
false
false
-
- varchar(255)
- true
- false
-
-
- varchar(255)
- true
- false
-
-
- varchar(255)
- true
- false
-
-
+
int4
true
false
-
+
+ varchar(255)
+ true
+ false
+
+
+ varchar(255)
+ true
+ false
+
+
+ varchar(255)
+ true
+ false
+
+
+ int4
+ true
+ false
+
+
varchar(64)
true
false
-
+
varchar(4000)
true
false
-
+
varchar(4000)
true
false
-
+
bool
true
false
+
+ int4
+ true
+ false
+
@@ -820,7 +840,85 @@
-
+
+
+ key_
+ version_
+
+
+
+
+
+
+ varchar(64)
+ false
+ false
+
+
+ int4
+ true
+ false
+
+
+ varchar(255)
+ false
+ false
+
+
+ varchar(255)
+ true
+ false
+
+
+ varchar(64)
+ true
+ false
+
+
+ varchar(64)
+ true
+ false
+
+
+ varchar(64)
+ true
+ false
+
+
+ varchar(255)
+ true
+ false
+
+
+ timestamp
+ false
+ false
+
+
+
+
+ id_
+
+
+
+
+ execution_id_
+ act_ru_execution
+ id_
+
+
+
+
+
+ configuration_
+
+
+
+
+ execution_id_
+
+
+
@@ -879,6 +977,21 @@
true
false
+
+ bool
+ true
+ false
+
+
+ int4
+ true
+ false
+
+
+ int4
+ true
+ false
+
@@ -963,6 +1076,11 @@
true
false
+
+ varchar(64)
+ true
+ false
+
@@ -970,6 +1088,11 @@
+
+ proc_def_id_
+ act_re_procdef
+ id_
+
task_id_
act_ru_task
@@ -987,6 +1110,11 @@
user_id_
+
+
+ proc_def_id_
+
+
task_id_
diff --git a/config/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-10.sql b/config/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-10.sql
new file mode 100644
index 0000000000..69b072b042
--- /dev/null
+++ b/config/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-10.sql
@@ -0,0 +1,99 @@
+--
+-- Title: Upgraded Activiti tables to 5.10 version
+-- Database: MySQL
+-- Since: V4.1 Schema 5115
+-- Author: Frederik Heremans
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+-- Upgraded Activiti tables to 5.10 version
+
+--
+-- Upgrade scripts for 5.8 to 5.9
+--
+
+alter table ACT_RU_EXECUTION
+add SUSPENSION_STATE_ integer;
+
+alter table ACT_RE_PROCDEF
+add SUSPENSION_STATE_ integer;
+
+alter table ACT_RE_PROCDEF
+add REV_ integer;
+
+update ACT_RE_PROCDEF set REV_ = 1;
+update ACT_RE_PROCDEF set SUSPENSION_STATE_ = 1;
+update ACT_RU_EXECUTION set SUSPENSION_STATE_ = 1;
+
+create table ACT_RU_EVENT_SUBSCR (
+ ID_ varchar(64) not null,
+ REV_ integer,
+ EVENT_TYPE_ varchar(255) not null,
+ EVENT_NAME_ varchar(255),
+ EXECUTION_ID_ varchar(64),
+ PROC_INST_ID_ varchar(64),
+ ACTIVITY_ID_ varchar(64),
+ CONFIGURATION_ varchar(255),
+ CREATED_ timestamp not null,
+ primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+
+alter table ACT_RU_EVENT_SUBSCR
+ add constraint ACT_FK_EVENT_EXEC
+ foreign key (EXECUTION_ID_)
+ references ACT_RU_EXECUTION(ID_);
+
+alter table ACT_RU_EXECUTION
+add IS_EVENT_SCOPE_ TINYINT;
+
+update ACT_RU_EXECUTION set IS_EVENT_SCOPE_ = 0;
+
+alter table ACT_HI_PROCINST
+add DELETE_REASON_ varchar(4000);
+
+alter table ACT_GE_BYTEARRAY
+add GENERATED_ TINYINT;
+
+update ACT_GE_BYTEARRAY set GENERATED_ = 0;
+
+--
+-- Upgrade scripts for 5.9 to 5.10
+--
+
+alter table ACT_RU_IDENTITYLINK
+add PROC_DEF_ID_ varchar(64);
+
+create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_);
+
+alter table ACT_RU_IDENTITYLINK
+ add constraint ACT_FK_ATHRZ_PROCEDEF
+ foreign key (PROC_DEF_ID_)
+ references ACT_RE_PROCDEF(ID_);
+
+alter table ACT_RU_EXECUTION
+ add CACHED_ENT_STATE_ integer;
+
+update ACT_RU_EXECUTION set CACHED_ENT_STATE_ = 7;
+
+alter table ACT_RE_PROCDEF
+ add constraint ACT_UNIQ_PROCDEF
+ unique (KEY_,VERSION_);
+
+--
+-- Update engine properties table
+--
+UPDATE ACT_GE_PROPERTY SET VALUE_ = '5.10' WHERE NAME_ = 'schema.version';
+UPDATE ACT_GE_PROPERTY SET VALUE_ = 'create(5.7) upgrade(5.10)' WHERE NAME_ = 'schema.history';
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.1-upgrade-to-activiti-5.10';
+INSERT INTO alf_applied_patch
+ (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+ VALUES
+ (
+ 'patch.db-V4.1-upgrade-to-activiti-5.10', 'Manually executed script upgrade V4.1: Upgraded Activiti tables to 5.10 version',
+ 0, 5111, -1, 5112, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
+ );
\ No newline at end of file
diff --git a/config/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-10.sql b/config/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-10.sql
new file mode 100644
index 0000000000..36bc413952
--- /dev/null
+++ b/config/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-10.sql
@@ -0,0 +1,103 @@
+--
+-- Title: Upgraded Activiti tables to 5.10 version
+-- Database: PostgreSQL
+-- Since: V4.1 Schema 5115
+-- Author: Frederik Heremans
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+-- Upgraded Activiti tables to 5.10 version
+
+--
+-- Upgrade scripts for 5.8 to 5.9
+--
+
+alter table ACT_RU_EXECUTION
+add column SUSPENSION_STATE_ integer;
+
+alter table ACT_RE_PROCDEF
+add column SUSPENSION_STATE_ integer;
+
+alter table ACT_RE_PROCDEF
+add column REV_ integer;
+
+update ACT_RE_PROCDEF set REV_ = 1;
+update ACT_RE_PROCDEF set SUSPENSION_STATE_ = 1;
+update ACT_RU_EXECUTION set SUSPENSION_STATE_ = 1;
+
+create table ACT_RU_EVENT_SUBSCR (
+ ID_ varchar(64) not null,
+ REV_ integer,
+ EVENT_TYPE_ varchar(255) not null,
+ EVENT_NAME_ varchar(255),
+ EXECUTION_ID_ varchar(64),
+ PROC_INST_ID_ varchar(64),
+ ACTIVITY_ID_ varchar(64),
+ CONFIGURATION_ varchar(255),
+ CREATED_ timestamp not null,
+ primary key (ID_)
+);
+
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+
+create index ACT_IDX_EVENT_SUBSCR on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_);
+alter table ACT_RU_EVENT_SUBSCR
+ add constraint ACT_FK_EVENT_EXEC
+ foreign key (EXECUTION_ID_)
+ references ACT_RU_EXECUTION(ID_);
+
+alter table ACT_RU_EXECUTION
+add column IS_EVENT_SCOPE_ boolean;
+
+update ACT_RU_EXECUTION set IS_EVENT_SCOPE_ = false;
+
+alter table ACT_HI_PROCINST
+add DELETE_REASON_ varchar(4000);
+
+alter table ACT_GE_BYTEARRAY
+add GENERATED_ boolean;
+
+update ACT_GE_BYTEARRAY set GENERATED_ = false;
+
+--
+-- Upgrade scripts for 5.9 to 5.10
+--
+
+alter table ACT_RU_IDENTITYLINK
+add PROC_DEF_ID_ varchar (64);
+
+create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_);
+
+alter table ACT_RU_IDENTITYLINK
+ add constraint ACT_FK_ATHRZ_PROCEDEF
+ foreign key (PROC_DEF_ID_)
+ references ACT_RE_PROCDEF (ID_);
+
+alter table ACT_RU_EXECUTION
+ add CACHED_ENT_STATE_ integer;
+
+update ACT_RU_EXECUTION set CACHED_ENT_STATE_ = 7;
+
+alter table ACT_RE_PROCDEF
+ add constraint ACT_UNIQ_PROCDEF
+ unique (KEY_,VERSION_);
+
+
+ --
+-- Update engine properties table
+--
+UPDATE ACT_GE_PROPERTY SET VALUE_ = '5.10' WHERE NAME_ = 'schema.version';
+UPDATE ACT_GE_PROPERTY SET VALUE_ = 'create(5.7) upgrade(5.10)' WHERE NAME_ = 'schema.history';
+
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.1-upgrade-to-activiti-5.10';
+INSERT INTO alf_applied_patch
+ (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+ VALUES
+ (
+ 'patch.db-V4.1-upgrade-to-activiti-5.10', 'Manually executed script upgrade V4.1: Upgraded Activiti tables to 5.10 version',
+ 0, 5111, -1, 5112, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
+ );
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index bd5873fe0e..c40c9a3184 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -485,4 +485,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully
patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
-patch.removeColumnActiviti.description=ALF-16038 : DB2: Upgrade script to remove ALFUSER.ACT_HI_ACTINST.OWNER_
\ No newline at end of file
+patch.removeColumnActiviti.description=ALF-16038 : DB2: Upgrade script to remove ALFUSER.ACT_HI_ACTINST.OWNER_
+
+patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service_de.properties b/config/alfresco/messages/patch-service_de.properties
index 6754bd86f3..3e4701653e 100755
--- a/config/alfresco/messages/patch-service_de.properties
+++ b/config/alfresco/messages/patch-service_de.properties
@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully
-patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
\ No newline at end of file
+patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
+
+patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service_es.properties b/config/alfresco/messages/patch-service_es.properties
index 6754bd86f3..3e4701653e 100755
--- a/config/alfresco/messages/patch-service_es.properties
+++ b/config/alfresco/messages/patch-service_es.properties
@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully
-patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
\ No newline at end of file
+patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
+
+patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service_fr.properties b/config/alfresco/messages/patch-service_fr.properties
index 6754bd86f3..3e4701653e 100755
--- a/config/alfresco/messages/patch-service_fr.properties
+++ b/config/alfresco/messages/patch-service_fr.properties
@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully
-patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
\ No newline at end of file
+patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
+
+patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service_it.properties b/config/alfresco/messages/patch-service_it.properties
index 6754bd86f3..bc957d6d51 100755
--- a/config/alfresco/messages/patch-service_it.properties
+++ b/config/alfresco/messages/patch-service_it.properties
@@ -482,4 +482,5 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully
-patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
\ No newline at end of file
+patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
+patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service_ja.properties b/config/alfresco/messages/patch-service_ja.properties
index 6754bd86f3..3e4701653e 100755
--- a/config/alfresco/messages/patch-service_ja.properties
+++ b/config/alfresco/messages/patch-service_ja.properties
@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully
-patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
\ No newline at end of file
+patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
+
+patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service_nl.properties b/config/alfresco/messages/patch-service_nl.properties
index 6754bd86f3..3e4701653e 100755
--- a/config/alfresco/messages/patch-service_nl.properties
+++ b/config/alfresco/messages/patch-service_nl.properties
@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully
-patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
\ No newline at end of file
+patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
+
+patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service_ru.properties b/config/alfresco/messages/patch-service_ru.properties
index 6754bd86f3..3e4701653e 100755
--- a/config/alfresco/messages/patch-service_ru.properties
+++ b/config/alfresco/messages/patch-service_ru.properties
@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully
-patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
\ No newline at end of file
+patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
+
+patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service_zh_CN.properties b/config/alfresco/messages/patch-service_zh_CN.properties
index 6754bd86f3..3e4701653e 100755
--- a/config/alfresco/messages/patch-service_zh_CN.properties
+++ b/config/alfresco/messages/patch-service_zh_CN.properties
@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully
-patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
\ No newline at end of file
+patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
+
+patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version
\ No newline at end of file
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 0df84d8e5c..533f09d56f 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -3372,4 +3372,15 @@
+
+ patch.db-V4.2-upgrade-to-activiti-5.10
+ patch.upgradeToActiviti5-10.description
+ 0
+ 6018
+ 6019
+
+ classpath:alfresco/dbscripts/upgrade/4.2/${db.script.dialect}/activiti-upgrade-5-10.sql
+
+
+
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index d275d79a04..2bc8673c72 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
# Schema number
-version.schema=6018
+version.schema=6019
diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
index 03027e4678..0d00397070 100644
--- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
+++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
@@ -787,7 +787,12 @@ public class SchemaBootstrap extends AbstractLifecycleBean
String dialectStr = dialect.getClass().getSimpleName();
// Initialise Activiti DB, using an unclosable connection
- initialiseActivitiDBSchema(new UnclosableConnection(connection));
+ if(create)
+ {
+ // Activiti DB updates are performed as patches in alfresco, only give
+ // control to activiti when creating new one.
+ initialiseActivitiDBSchema(new UnclosableConnection(connection));
+ }
if (create)
{
@@ -875,8 +880,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
}
/**
- * Initialises the Activiti DB schema, if not present it's created, if
- * present it is upgraded appropriately if necessary.
+ * Initialises the Activiti DB schema, if not present it's created.
*
* @param connection Connection to use the initialise DB schema
*/
diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
index eaa4d12cd2..16b3365632 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
@@ -335,7 +335,7 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
{
try
{
- String resourceName = GUID.generate() + BpmnDeployer.BPMN_RESOURCE_SUFFIX;
+ String resourceName = GUID.generate() + BpmnDeployer.BPMN_RESOURCE_SUFFIXES[0];
if(tenantService.isEnabled())
{
diff --git a/source/java/org/alfresco/repo/workflow/activiti/AlfrescoBpmnParseListener.java b/source/java/org/alfresco/repo/workflow/activiti/AlfrescoBpmnParseListener.java
index be3b892c74..a1caf65e12 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/AlfrescoBpmnParseListener.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/AlfrescoBpmnParseListener.java
@@ -224,4 +224,70 @@ public class AlfrescoBpmnParseListener implements BpmnParseListener
this.tenantService = tenantService;
}
+ @Override
+ public void parseInclusiveGateway(Element inclusiveGwElement,
+ ScopeImpl scope, ActivityImpl activity) {
+ // Nothing to do here
+ }
+
+ @Override
+ public void parseReceiveTask(Element receiveTaskElement, ScopeImpl scope,
+ ActivityImpl activity) {
+ // Nothing to do here
+ }
+
+ @Override
+ public void parseIntermediateSignalCatchEventDefinition(
+ Element signalEventDefinition, ActivityImpl signalActivity) {
+ // Nothing to do here
+ }
+
+ @Override
+ public void parseIntermediateMessageCatchEventDefinition(
+ Element messageEventDefinition, ActivityImpl nestedActivity) {
+ // Nothing to do here
+ }
+
+ @Override
+ public void parseBoundarySignalEventDefinition(
+ Element signalEventDefinition, boolean interrupting,
+ ActivityImpl signalActivity) {
+ // Nothing to do here
+ }
+
+ @Override
+ public void parseEventBasedGateway(Element eventBasedGwElement,
+ ScopeImpl scope, ActivityImpl activity) {
+ // Nothing to do here
+ }
+
+ @Override
+ public void parseTransaction(Element transactionElement, ScopeImpl scope,
+ ActivityImpl activity) {
+ // Nothing to do here
+ }
+
+ @Override
+ public void parseCompensateEventDefinition(
+ Element compensateEventDefinition, ActivityImpl compensationActivity) {
+ // Nothing to do here
+ }
+
+ @Override
+ public void parseIntermediateThrowEvent(Element intermediateEventElement,
+ ScopeImpl scope, ActivityImpl activity) {
+ // Nothing to do here
+ }
+
+ @Override
+ public void parseIntermediateCatchEvent(Element intermediateEventElement,
+ ScopeImpl scope, ActivityImpl activity) {
+ // Nothing to do here
+ }
+
+ @Override
+ public void parseBoundaryEvent(Element boundaryEventElement,
+ ScopeImpl scopeElement, ActivityImpl nestedActivity) {
+ // Nothing to do here
+ }
}