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

ALF-16098: Upgraded Activiti to version 5.10

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Frederik Heremans
2012-09-28 07:07:03 +00:00
parent 6a9b191741
commit ddf01d02c4
19 changed files with 617 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/bootstrap-context.xml
View File

@@ -172,6 +172,7 @@
<ref bean="patch.db-V4.1-NodeDeleted" /> <ref bean="patch.db-V4.1-NodeDeleted" />
<ref bean="patch.db-V4.1-increase-column-size-activiti" /> <ref bean="patch.db-V4.1-increase-column-size-activiti" />
<ref bean="patch.db-V4.1-remove-column-activiti" /> <ref bean="patch.db-V4.1-remove-column-activiti" />
<ref bean="patch.db-V4.2-upgrade-to-activiti-5.10" />
</list> </list>
</property> </property>
</bean> </bean>

174
config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.alfresco.org/repo/db-schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.alfresco.org/repo/db-schema db-schema.xsd" name="" dbprefix="act_" version="5026"> <schema xmlns="http://www.alfresco.org/repo/db-schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.alfresco.org/repo/db-schema db-schema.xsd" name="" dbprefix="act_" version="6019">
<validators> <validators>
<validator class="org.alfresco.util.schemacomp.validator.NameValidator"> <validator class="org.alfresco.util.schemacomp.validator.NameValidator">
<properties> <properties>
@@ -36,6 +36,11 @@
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="GENERATED_" order="6">
<type>tinyint</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns> </columns>
<primarykey name="PRIMARY"> <primarykey name="PRIMARY">
<columnnames> <columnnames>
@@ -491,46 +496,56 @@
<nullable>false</nullable> <nullable>false</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="CATEGORY_" order="2"> <column name="REV_" order="2">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="NAME_" order="3">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="KEY_" order="4">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="VERSION_" order="5">
<type>int</type> <type>int</type>
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="DEPLOYMENT_ID_" order="6"> <column name="CATEGORY_" order="3">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="NAME_" order="4">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="KEY_" order="5">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="VERSION_" order="6">
<type>int</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="DEPLOYMENT_ID_" order="7">
<type>varchar(64)</type> <type>varchar(64)</type>
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="RESOURCE_NAME_" order="7"> <column name="RESOURCE_NAME_" order="8">
<type>varchar(4000)</type> <type>varchar(4000)</type>
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="DGRM_RESOURCE_NAME_" order="8"> <column name="DGRM_RESOURCE_NAME_" order="9">
<type>varchar(4000)</type> <type>varchar(4000)</type>
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="HAS_START_FORM_KEY_" order="9"> <column name="HAS_START_FORM_KEY_" order="10">
<type>tinyint</type> <type>tinyint</type>
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="SUSPENSION_STATE_" order="11">
<type>int</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns> </columns>
<primarykey name="PRIMARY"> <primarykey name="PRIMARY">
<columnnames> <columnnames>
@@ -538,7 +553,87 @@
</columnnames> </columnnames>
</primarykey> </primarykey>
<foreignkeys/> <foreignkeys/>
<indexes/> <indexes>
<index name="ACT_UNIQ_PROCDEF" unique="true">
<columnnames>
<columnname>KEY_</columnname>
<columnname>VERSION_</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="ACT_RU_EVENT_SUBSCR">
<columns>
<column name="ID_" order="1">
<type>varchar(64)</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="REV_" order="2">
<type>int</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="EVENT_TYPE_" order="3">
<type>varchar(255)</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="EVENT_NAME_" order="4">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="EXECUTION_ID_" order="5">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="PROC_INST_ID_" order="6">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="ACTIVITY_ID_" order="7">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="CONFIGURATION_" order="8">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="CREATED_" order="9">
<type>timestamp</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
</columns>
<primarykey name="PRIMARY">
<columnnames>
<columnname order="1">ID_</columnname>
</columnnames>
</primarykey>
<foreignkeys>
<foreignkey name="ACT_FK_EVENT_EXEC">
<localcolumn>EXECUTION_ID_</localcolumn>
<targettable>act_ru_execution</targettable>
<targetcolumn>ID_</targetcolumn>
</foreignkey>
</foreignkeys>
<indexes>
<index name="ACT_IDX_EVENT_SUBSCR_CONFIG_" unique="false">
<columnnames>
<columnname>CONFIGURATION_</columnname>
</columnnames>
</index>
<index name="ACT_FK_EVENT_EXEC" unique="false">
<columnnames>
<columnname>EXECUTION_ID_</columnname>
</columnnames>
</index>
</indexes>
</table> </table>
<table name="ACT_RU_EXECUTION"> <table name="ACT_RU_EXECUTION">
<columns> <columns>
@@ -597,6 +692,21 @@
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="IS_EVENT_SCOPE_" order="12">
<type>tinyint</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="SUSPENSION_STATE_" order="13">
<type>int</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="CACHED_ENT_STATE_" order="14">
<type>int</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns> </columns>
<primarykey name="PRIMARY"> <primarykey name="PRIMARY">
<columnnames> <columnnames>
@@ -681,6 +791,11 @@
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="PROC_DEF_ID_" order="7">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns> </columns>
<primarykey name="PRIMARY"> <primarykey name="PRIMARY">
<columnnames> <columnnames>
@@ -688,6 +803,11 @@
</columnnames> </columnnames>
</primarykey> </primarykey>
<foreignkeys> <foreignkeys>
<foreignkey name="ACT_FK_ATHRZ_PROCEDEF">
<localcolumn>PROC_DEF_ID_</localcolumn>
<targettable>act_re_procdef</targettable>
<targetcolumn>ID_</targetcolumn>
</foreignkey>
<foreignkey name="ACT_FK_TSKASS_TASK"> <foreignkey name="ACT_FK_TSKASS_TASK">
<localcolumn>TASK_ID_</localcolumn> <localcolumn>TASK_ID_</localcolumn>
<targettable>ACT_RU_TASK</targettable> <targettable>ACT_RU_TASK</targettable>
@@ -705,6 +825,11 @@
<columnname>GROUP_ID_</columnname> <columnname>GROUP_ID_</columnname>
</columnnames> </columnnames>
</index> </index>
<index name="ACT_IDX_ATHRZ_PROCEDEF" unique="false">
<columnnames>
<columnname>PROC_DEF_ID_</columnname>
</columnnames>
</index>
<index name="ACT_FK_TSKASS_TASK" unique="false"> <index name="ACT_FK_TSKASS_TASK" unique="false">
<columnnames> <columnnames>
<columnname>TASK_ID_</columnname> <columnname>TASK_ID_</columnname>
@@ -1287,6 +1412,11 @@
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="DELETE_REASON_" order="12">
<type>varchar(4000)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns> </columns>
<primarykey name="PRIMARY"> <primarykey name="PRIMARY">
<columnnames> <columnnames>

172
config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.alfresco.org/repo/db-schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.alfresco.org/repo/db-schema db-schema.xsd" name="" dbprefix="act_" version="5026"> <schema xmlns="http://www.alfresco.org/repo/db-schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.alfresco.org/repo/db-schema db-schema.xsd" name="" dbprefix="act_" version="6019">
<validators> <validators>
<validator class="org.alfresco.util.schemacomp.validator.NameValidator"> <validator class="org.alfresco.util.schemacomp.validator.NameValidator">
<properties> <properties>
@@ -36,6 +36,11 @@
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="generated_" order="6">
<type>bool</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns> </columns>
<primarykey name="act_ge_bytearray_pkey"> <primarykey name="act_ge_bytearray_pkey">
<columnnames> <columnnames>
@@ -446,6 +451,11 @@
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="delete_reason_" order="12">
<type>varchar(4000)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns> </columns>
<primarykey name="act_hi_procinst_pkey"> <primarykey name="act_hi_procinst_pkey">
<columnnames> <columnnames>
@@ -773,46 +783,56 @@
<nullable>false</nullable> <nullable>false</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="category_" order="2"> <column name="rev_" order="2">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="name_" order="3">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="key_" order="4">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="version_" order="5">
<type>int4</type> <type>int4</type>
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="deployment_id_" order="6"> <column name="category_" order="3">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="name_" order="4">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="key_" order="5">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="version_" order="6">
<type>int4</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="deployment_id_" order="7">
<type>varchar(64)</type> <type>varchar(64)</type>
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="resource_name_" order="7"> <column name="resource_name_" order="8">
<type>varchar(4000)</type> <type>varchar(4000)</type>
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="dgrm_resource_name_" order="8"> <column name="dgrm_resource_name_" order="9">
<type>varchar(4000)</type> <type>varchar(4000)</type>
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="has_start_form_key_" order="9"> <column name="has_start_form_key_" order="10">
<type>bool</type> <type>bool</type>
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="suspension_state_" order="11">
<type>int4</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns> </columns>
<primarykey name="act_re_procdef_pkey"> <primarykey name="act_re_procdef_pkey">
<columnnames> <columnnames>
@@ -820,7 +840,85 @@
</columnnames> </columnnames>
</primarykey> </primarykey>
<foreignkeys/> <foreignkeys/>
<indexes/> <index name="act_uniq_procdef" unique="true">
<columnnames>
<columnname>key_</columnname>
<columnname>version_</columnname>
</columnnames>
</index>
</table>
<table name="act_ru_event_subscr">
<columns>
<column name="id_" order="1">
<type>varchar(64)</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="rev_" order="2">
<type>int4</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="event_type_" order="3">
<type>varchar(255)</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="event_name_" order="4">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="execution_id_" order="5">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="proc_inst_id_" order="6">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="activity_id_" order="7">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="configuration_" order="8">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="created_" order="9">
<type>timestamp</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
</columns>
<primarykey name="act_ru_event_subscr_pkey">
<columnnames>
<columnname order="1">id_</columnname>
</columnnames>
</primarykey>
<foreignkeys>
<foreignkey name="act_fk_event_exec">
<localcolumn>execution_id_</localcolumn>
<targettable>act_ru_execution</targettable>
<targetcolumn>id_</targetcolumn>
</foreignkey>
</foreignkeys>
<indexes>
<index name="act_idx_event_subscr_config_" unique="false">
<columnnames>
<columnname>configuration_</columnname>
</columnnames>
</index>
<index name="act_idx_event_subscr" unique="false">
<columnnames>
<columnname>execution_id_</columnname>
</columnnames>
</index>
</indexes>
</table> </table>
<table name="act_ru_execution"> <table name="act_ru_execution">
<columns> <columns>
@@ -879,6 +977,21 @@
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="is_event_scope_" order="12">
<type>bool</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="suspension_state_" order="13">
<type>int4</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="cached_ent_state_" order="14">
<type>int4</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns> </columns>
<primarykey name="act_ru_execution_pkey"> <primarykey name="act_ru_execution_pkey">
<columnnames> <columnnames>
@@ -963,6 +1076,11 @@
<nullable>true</nullable> <nullable>true</nullable>
<autoincrement>false</autoincrement> <autoincrement>false</autoincrement>
</column> </column>
<column name="proc_def_id_" order="7">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns> </columns>
<primarykey name="act_ru_identitylink_pkey"> <primarykey name="act_ru_identitylink_pkey">
<columnnames> <columnnames>
@@ -970,6 +1088,11 @@
</columnnames> </columnnames>
</primarykey> </primarykey>
<foreignkeys> <foreignkeys>
<foreignkey name="act_fk_athrz_procedef">
<localcolumn>proc_def_id_</localcolumn>
<targettable>act_re_procdef</targettable>
<targetcolumn>id_</targetcolumn>
</foreignkey>
<foreignkey name="act_fk_tskass_task"> <foreignkey name="act_fk_tskass_task">
<localcolumn>task_id_</localcolumn> <localcolumn>task_id_</localcolumn>
<targettable>act_ru_task</targettable> <targettable>act_ru_task</targettable>
@@ -987,6 +1110,11 @@
<columnname>user_id_</columnname> <columnname>user_id_</columnname>
</columnnames> </columnnames>
</index> </index>
<index name="act_idx_athrz_procedef" unique="false">
<columnnames>
<columnname>proc_def_id_</columnname>
</columnnames>
</index>
<index name="act_idx_tskass_task" unique="false"> <index name="act_idx_tskass_task" unique="false">
<columnnames> <columnnames>
<columnname>task_id_</columnname> <columnname>task_id_</columnname>

99
config/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-10.sql Normal file
View File

@@ -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'
);

103
config/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-10.sql Normal file
View File

@@ -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'
);

4
config/alfresco/messages/patch-service.properties
View File

@@ -485,4 +485,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully patch.show.audit.success=show_audit.ftl was updated successfully
patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti 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_ 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

4
config/alfresco/messages/patch-service_de.properties
View File

@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully patch.show.audit.success=show_audit.ftl was updated successfully
patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version

4
config/alfresco/messages/patch-service_es.properties
View File

@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully patch.show.audit.success=show_audit.ftl was updated successfully
patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version

4
config/alfresco/messages/patch-service_fr.properties
View File

@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully patch.show.audit.success=show_audit.ftl was updated successfully
patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version

3
config/alfresco/messages/patch-service_it.properties
View File

@@ -482,4 +482,5 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully patch.show.audit.success=show_audit.ftl was updated successfully
patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version

4
config/alfresco/messages/patch-service_ja.properties
View File

@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully patch.show.audit.success=show_audit.ftl was updated successfully
patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version

4
config/alfresco/messages/patch-service_nl.properties
View File

@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully patch.show.audit.success=show_audit.ftl was updated successfully
patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version

4
config/alfresco/messages/patch-service_ru.properties
View File

@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully patch.show.audit.success=show_audit.ftl was updated successfully
patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version

4
config/alfresco/messages/patch-service_zh_CN.properties
View File

@@ -482,4 +482,6 @@ patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both pa
patch.show.audit.success=show_audit.ftl was updated successfully patch.show.audit.success=show_audit.ftl was updated successfully
patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
patch.upgradeToActiviti5-10.description=Upgraded Activiti tables to 5.10 version

11
config/alfresco/patch/patch-services-context.xml
View File

@@ -3372,4 +3372,15 @@
</property> </property>
</bean> </bean>
<bean id="patch.db-V4.2-upgrade-to-activiti-5.10" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V4.2-upgrade-to-activiti-5.10</value></property>
<property name="description"><value>patch.upgradeToActiviti5-10.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>6018</value></property>
<property name="targetSchema"><value>6019</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/4.2/${db.script.dialect}/activiti-upgrade-5-10.sql</value>
</property>
</bean>
</beans> </beans>

2
config/alfresco/version.properties
View File

@@ -19,4 +19,4 @@ version.build=@build-number@
# Schema number # Schema number
version.schema=6018 version.schema=6019

10
source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
View File

@@ -787,7 +787,12 @@ public class SchemaBootstrap extends AbstractLifecycleBean
String dialectStr = dialect.getClass().getSimpleName(); String dialectStr = dialect.getClass().getSimpleName();
// Initialise Activiti DB, using an unclosable connection // 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) if (create)
{ {
@@ -875,8 +880,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
} }
/** /**
* Initialises the Activiti DB schema, if not present it's created, if * Initialises the Activiti DB schema, if not present it's created.
* present it is upgraded appropriately if necessary.
* *
* @param connection Connection to use the initialise DB schema * @param connection Connection to use the initialise DB schema
*/ */

2
source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
View File

@@ -335,7 +335,7 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
{ {
try try
{ {
String resourceName = GUID.generate() + BpmnDeployer.BPMN_RESOURCE_SUFFIX; String resourceName = GUID.generate() + BpmnDeployer.BPMN_RESOURCE_SUFFIXES[0];
if(tenantService.isEnabled()) if(tenantService.isEnabled())
{ {

66
source/java/org/alfresco/repo/workflow/activiti/AlfrescoBpmnParseListener.java
View File

@@ -224,4 +224,70 @@ public class AlfrescoBpmnParseListener implements BpmnParseListener
this.tenantService = tenantService; 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
}
} }