From c108ec7940f2cf72199cd2bb3f67b445921eafaf Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 15 Feb 2017 11:48:00 +0000 Subject: [PATCH] Cherry-pick RM-4234 into release/V2.5.0.x (2.5.1 performance improvements). (cherry picked from commit 6a53e953f56fd788f58cf32f1ef0fece13270785) --- l10n.properties | 2 +- .../module/org_alfresco_module_rm/rm-service-context.xml | 3 ++- .../module/org_alfresco_module_rm/version_de.properties | 3 --- .../module/org_alfresco_module_rm/version_es.properties | 3 --- .../module/org_alfresco_module_rm/version_fr.properties | 3 --- .../module/org_alfresco_module_rm/version_it.properties | 3 --- .../module/org_alfresco_module_rm/version_ja.properties | 3 --- .../module/org_alfresco_module_rm/version_nb.properties | 3 --- .../module/org_alfresco_module_rm/version_nl.properties | 3 --- .../module/org_alfresco_module_rm/version_pt_BR.properties | 3 --- .../module/org_alfresco_module_rm/version_ru.properties | 3 --- .../module/org_alfresco_module_rm/version_zh_CN.properties | 3 --- 12 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_de.properties delete mode 100644 rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_es.properties delete mode 100644 rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_fr.properties delete mode 100644 rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_it.properties delete mode 100644 rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_ja.properties delete mode 100644 rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_nb.properties delete mode 100644 rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_nl.properties delete mode 100644 rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_pt_BR.properties delete mode 100644 rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_ru.properties delete mode 100644 rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_zh_CN.properties diff --git a/l10n.properties b/l10n.properties index 663ca0f168..4bde720182 100644 --- a/l10n.properties +++ b/l10n.properties @@ -1,4 +1,4 @@ # Localisation config overrides for Records Management module MESSAGE_SEARCH_PATH="rm-community/rm-community-repo/config rm-community/rm-community-share rm-community/rm-share/source rm-enterprise/rm-enterprise-repo/src/main rm-enterprise/rm-enterprise-share/src/main " -EXCLUDED_FILES="$EXCLUDED_FILES rm-method-security.properties springloaded.properties file-mapping.properties classified-content-notForTranslating.properties notForTranslating" +EXCLUDED_FILES="$EXCLUDED_FILES rm-method-security.properties springloaded.properties file-mapping.properties classified-content-notForTranslating.properties notForTranslating version.properties" EXTENSION_PREFIX=-RM diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 0ed6c73149..a1b9b03797 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -32,7 +32,8 @@ - + + diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_de.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_de.properties deleted file mode 100644 index cf2c7c2600..0000000000 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_de.properties +++ /dev/null @@ -1,3 +0,0 @@ -# RM Schema number - -version.rm.schema=2501 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_es.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_es.properties deleted file mode 100644 index cf2c7c2600..0000000000 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_es.properties +++ /dev/null @@ -1,3 +0,0 @@ -# RM Schema number - -version.rm.schema=2501 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_fr.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_fr.properties deleted file mode 100644 index cf2c7c2600..0000000000 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_fr.properties +++ /dev/null @@ -1,3 +0,0 @@ -# RM Schema number - -version.rm.schema=2501 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_it.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_it.properties deleted file mode 100644 index cf2c7c2600..0000000000 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_it.properties +++ /dev/null @@ -1,3 +0,0 @@ -# RM Schema number - -version.rm.schema=2501 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_ja.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_ja.properties deleted file mode 100644 index cf2c7c2600..0000000000 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_ja.properties +++ /dev/null @@ -1,3 +0,0 @@ -# RM Schema number - -version.rm.schema=2501 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_nb.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_nb.properties deleted file mode 100644 index cf2c7c2600..0000000000 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_nb.properties +++ /dev/null @@ -1,3 +0,0 @@ -# RM Schema number - -version.rm.schema=2501 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_nl.properties deleted file mode 100644 index cf2c7c2600..0000000000 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_nl.properties +++ /dev/null @@ -1,3 +0,0 @@ -# RM Schema number - -version.rm.schema=2501 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_pt_BR.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_pt_BR.properties deleted file mode 100644 index cf2c7c2600..0000000000 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_pt_BR.properties +++ /dev/null @@ -1,3 +0,0 @@ -# RM Schema number - -version.rm.schema=2501 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_ru.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_ru.properties deleted file mode 100644 index cf2c7c2600..0000000000 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_ru.properties +++ /dev/null @@ -1,3 +0,0 @@ -# RM Schema number - -version.rm.schema=2501 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_zh_CN.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_zh_CN.properties deleted file mode 100644 index cf2c7c2600..0000000000 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_zh_CN.properties +++ /dev/null @@ -1,3 +0,0 @@ -# RM Schema number - -version.rm.schema=2501