From 4e9f076a19fe1a26f6ecd7dc2365e320b402a66d Mon Sep 17 00:00:00 2001 From: Pavel Yurke Date: Mon, 20 Oct 2014 08:33:01 +0000 Subject: [PATCH] ACE-3188 : Incorporate Activiti 5.16.4: New index added: act_hi_varinst.act_idx_hi_procvar_task_id - Added update scripts for activiti 5.16.4. - Updated schema reference files. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../Schema-Reference-ACT.xml | 7 +++++- .../Schema-Reference-ACT.xml | 7 +++++- .../alfresco/dbscripts/db-schema-context.xml | 1 + .../activiti-upgrade-5-16-4.sql | 24 +++++++++++++++++++ .../messages/patch-service.properties | 2 ++ .../messages/patch-service_de.properties | 2 ++ .../messages/patch-service_es.properties | 2 ++ .../messages/patch-service_fr.properties | 2 ++ .../messages/patch-service_it.properties | 2 ++ .../messages/patch-service_ja.properties | 2 ++ .../messages/patch-service_nb.properties | 2 ++ .../messages/patch-service_nl.properties | 2 ++ .../messages/patch-service_pt_BR.properties | 2 ++ .../messages/patch-service_ru.properties | 2 ++ .../messages/patch-service_zh_CN.properties | 2 ++ .../alfresco/patch/patch-services-context.xml | 11 +++++++++ config/alfresco/version.properties | 2 +- 17 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 config/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/activiti-upgrade-5-16-4.sql 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 51b7afdcbb..dcc8e5bcc7 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 @@ -4,7 +4,7 @@ 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="8004" + version="8009" tablecolumnorder="false"> @@ -783,6 +783,11 @@ VAR_TYPE_ + + + TASK_ID_ + + 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 40366f2be7..e81d8f414f 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 @@ -4,7 +4,7 @@ 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="8004" + version="8009" tablecolumnorder="false"> @@ -855,6 +855,11 @@ proc_inst_id_ + + + task_id_ + +
diff --git a/config/alfresco/dbscripts/db-schema-context.xml b/config/alfresco/dbscripts/db-schema-context.xml index 224f8b9563..d48f827ff9 100644 --- a/config/alfresco/dbscripts/db-schema-context.xml +++ b/config/alfresco/dbscripts/db-schema-context.xml @@ -81,6 +81,7 @@ + diff --git a/config/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/activiti-upgrade-5-16-4.sql b/config/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/activiti-upgrade-5-16-4.sql new file mode 100644 index 0000000000..6a068d9a7f --- /dev/null +++ b/config/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/activiti-upgrade-5-16-4.sql @@ -0,0 +1,24 @@ +-- +-- Title: Upgraded Activiti tables from 5.16.2 to 5.16.4 version +-- Database: Generic +-- Since: V5.0 Schema 8009 +-- Author: Pavel Yurkevich +-- +-- Please contact support@alfresco.com if you need assistance with the upgrade. +-- + +update ACT_GE_PROPERTY set VALUE_ = '5.16.4.0' where NAME_ = 'schema.version'; + +create index ACT_IDX_HI_PROCVAR_TASK_ID on ACT_HI_VARINST(TASK_ID_); + +-- +-- Record script finish +-- +DELETE FROM alf_applied_patch WHERE id = 'patch.db-V5.0-upgrade-to-activiti-5.16.4'; +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-V5.0-upgrade-to-activiti-5.16.4', 'Manually executed script upgrade V5.0: Upgraded Activiti tables to 5.16.4 version', + 0, 8008, -1, 8009, 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 4ea42f8062..8e8e11507c 100644 --- a/config/alfresco/messages/patch-service.properties +++ b/config/alfresco/messages/patch-service.properties @@ -345,3 +345,5 @@ patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary patch.eol-wcmwf.description=Undeploys deprecated WCMWF Workflows + +patch.db-V5.0-upgrade-to-activiti-5.16.4.description=Update Activiti tables from 5.16.2 to 5.16.4 diff --git a/config/alfresco/messages/patch-service_de.properties b/config/alfresco/messages/patch-service_de.properties index d13cc6429b..e4e460c393 100755 --- a/config/alfresco/messages/patch-service_de.properties +++ b/config/alfresco/messages/patch-service_de.properties @@ -345,3 +345,5 @@ patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary patch.eol-wcmwf.description=Undeploys deprecated WCMWF Workflows + +patch.db-V5.0-upgrade-to-activiti-5.16.4.description=Update Activiti tables from 5.16.2 to 5.16.4 diff --git a/config/alfresco/messages/patch-service_es.properties b/config/alfresco/messages/patch-service_es.properties index d13cc6429b..e4e460c393 100755 --- a/config/alfresco/messages/patch-service_es.properties +++ b/config/alfresco/messages/patch-service_es.properties @@ -345,3 +345,5 @@ patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary patch.eol-wcmwf.description=Undeploys deprecated WCMWF Workflows + +patch.db-V5.0-upgrade-to-activiti-5.16.4.description=Update Activiti tables from 5.16.2 to 5.16.4 diff --git a/config/alfresco/messages/patch-service_fr.properties b/config/alfresco/messages/patch-service_fr.properties index d13cc6429b..e4e460c393 100755 --- a/config/alfresco/messages/patch-service_fr.properties +++ b/config/alfresco/messages/patch-service_fr.properties @@ -345,3 +345,5 @@ patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary patch.eol-wcmwf.description=Undeploys deprecated WCMWF Workflows + +patch.db-V5.0-upgrade-to-activiti-5.16.4.description=Update Activiti tables from 5.16.2 to 5.16.4 diff --git a/config/alfresco/messages/patch-service_it.properties b/config/alfresco/messages/patch-service_it.properties index d13cc6429b..e4e460c393 100755 --- a/config/alfresco/messages/patch-service_it.properties +++ b/config/alfresco/messages/patch-service_it.properties @@ -345,3 +345,5 @@ patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary patch.eol-wcmwf.description=Undeploys deprecated WCMWF Workflows + +patch.db-V5.0-upgrade-to-activiti-5.16.4.description=Update Activiti tables from 5.16.2 to 5.16.4 diff --git a/config/alfresco/messages/patch-service_ja.properties b/config/alfresco/messages/patch-service_ja.properties index d13cc6429b..e4e460c393 100755 --- a/config/alfresco/messages/patch-service_ja.properties +++ b/config/alfresco/messages/patch-service_ja.properties @@ -345,3 +345,5 @@ patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary patch.eol-wcmwf.description=Undeploys deprecated WCMWF Workflows + +patch.db-V5.0-upgrade-to-activiti-5.16.4.description=Update Activiti tables from 5.16.2 to 5.16.4 diff --git a/config/alfresco/messages/patch-service_nb.properties b/config/alfresco/messages/patch-service_nb.properties index d13cc6429b..e4e460c393 100755 --- a/config/alfresco/messages/patch-service_nb.properties +++ b/config/alfresco/messages/patch-service_nb.properties @@ -345,3 +345,5 @@ patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary patch.eol-wcmwf.description=Undeploys deprecated WCMWF Workflows + +patch.db-V5.0-upgrade-to-activiti-5.16.4.description=Update Activiti tables from 5.16.2 to 5.16.4 diff --git a/config/alfresco/messages/patch-service_nl.properties b/config/alfresco/messages/patch-service_nl.properties index d13cc6429b..e4e460c393 100755 --- a/config/alfresco/messages/patch-service_nl.properties +++ b/config/alfresco/messages/patch-service_nl.properties @@ -345,3 +345,5 @@ patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary patch.eol-wcmwf.description=Undeploys deprecated WCMWF Workflows + +patch.db-V5.0-upgrade-to-activiti-5.16.4.description=Update Activiti tables from 5.16.2 to 5.16.4 diff --git a/config/alfresco/messages/patch-service_pt_BR.properties b/config/alfresco/messages/patch-service_pt_BR.properties index d13cc6429b..e4e460c393 100644 --- a/config/alfresco/messages/patch-service_pt_BR.properties +++ b/config/alfresco/messages/patch-service_pt_BR.properties @@ -345,3 +345,5 @@ patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary patch.eol-wcmwf.description=Undeploys deprecated WCMWF Workflows + +patch.db-V5.0-upgrade-to-activiti-5.16.4.description=Update Activiti tables from 5.16.2 to 5.16.4 diff --git a/config/alfresco/messages/patch-service_ru.properties b/config/alfresco/messages/patch-service_ru.properties index d13cc6429b..e4e460c393 100755 --- a/config/alfresco/messages/patch-service_ru.properties +++ b/config/alfresco/messages/patch-service_ru.properties @@ -345,3 +345,5 @@ patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary patch.eol-wcmwf.description=Undeploys deprecated WCMWF Workflows + +patch.db-V5.0-upgrade-to-activiti-5.16.4.description=Update Activiti tables from 5.16.2 to 5.16.4 diff --git a/config/alfresco/messages/patch-service_zh_CN.properties b/config/alfresco/messages/patch-service_zh_CN.properties index d13cc6429b..e4e460c393 100755 --- a/config/alfresco/messages/patch-service_zh_CN.properties +++ b/config/alfresco/messages/patch-service_zh_CN.properties @@ -345,3 +345,5 @@ patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary patch.eol-wcmwf.description=Undeploys deprecated WCMWF Workflows + +patch.db-V5.0-upgrade-to-activiti-5.16.4.description=Update Activiti tables from 5.16.2 to 5.16.4 diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml index ae16b3b278..c23d382a29 100644 --- a/config/alfresco/patch/patch-services-context.xml +++ b/config/alfresco/patch/patch-services-context.xml @@ -1095,4 +1095,15 @@ + + + + + + + + classpath:alfresco/dbscripts/upgrade/5.0/${db.script.dialect}/activiti-upgrade-5-16-4.sql + + + diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties index 97457e779b..d2cc316589 100644 --- a/config/alfresco/version.properties +++ b/config/alfresco/version.properties @@ -23,4 +23,4 @@ version.build=r@scm-revision@-b@build-number@ # Schema number -version.schema=8008 +version.schema=8009