From d83aad2ad232f486aba454d92e0ddba30231f4c9 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 31 May 2019 09:54:34 +0200
Subject: [PATCH] Option for disabling the client-contextual cache
---
.../defaultBlob/_____configuration.xml | 29 +++++++++++++
.../aliasConfig/updateForDataCaching.xml | 12 ++++++
.../basic/2019.2/changelog.xml | 17 ++++----
.../create_asys_notificationcontents.xml | 42 +++++++++----------
.../create_asys_notifications.xml | 0
.../create_asys_permission.xml | 24 +++++------
.../create_asys_permissionaction.xml | 22 +++++-----
.../create_asys_permissionset.xml | 28 ++++++-------
.liquibase/_____SYSTEMALIAS/changelog.xml | 13 +++---
process/DataCaching_lib/process.js | 10 ++++-
10 files changed, 123 insertions(+), 74 deletions(-)
create mode 100644 .liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/defaultBlob/_____configuration.xml
create mode 100644 .liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/updateForDataCaching.xml
rename .liquibase/_____SYSTEMALIAS/basic/2019.2/{ => notificationcenter}/create_asys_notificationcontents.xml (98%)
rename .liquibase/_____SYSTEMALIAS/basic/2019.2/{ => notificationcenter}/create_asys_notifications.xml (100%)
rename .liquibase/_____SYSTEMALIAS/basic/2019.2/{ => permission}/create_asys_permission.xml (98%)
rename .liquibase/_____SYSTEMALIAS/basic/2019.2/{ => permission}/create_asys_permissionaction.xml (98%)
rename .liquibase/_____SYSTEMALIAS/basic/2019.2/{ => permission}/create_asys_permissionset.xml (98%)
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/defaultBlob/_____configuration.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/defaultBlob/_____configuration.xml
new file mode 100644
index 0000000000..75377250d1
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/defaultBlob/_____configuration.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.0">
+ <name>_____CONFIGURATION</name>
+ <serverId>default</serverId>
+ <definitionName>_____CONFIGURATION</definitionName>
+ <aliasConfigSub>
+ <aliasSubInstanceConfiguration>
+ <databaseAuditEnabled v="true" />
+ <indexsearchEnabled v="true" />
+ <loggingConsoleEnabled v="true" />
+ <loggingFileEnabled v="true" />
+ <loggingRemoteEnabled v="false" />
+ <neonVaadinClientEnabled v="true" />
+ <neonDisableConnectionSecurity v="false" />
+ <neonUseDummyKeystore v="true" />
+ <securityConnectionSSLEnabled v="true" />
+ <securitySSLDisableCertificateCheck v="true" />
+ <telephonyEnabled v="true" />
+ <telephonyProvider></telephonyProvider>
+ <customProperties>
+ <customBooleanProperty>
+ <name>dataCaching.client.forceDisable</name>
+ <description>Enabling this option will disable the per-client-context data-cache within the customzing (for exameple the caching of Keywords). This is usefull if you're testing and want to frequently add data like keywords, etc. which are cached which help of the "DataCaching_lib".</description>
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
+ </aliasSubInstanceConfiguration>
+ </aliasConfigSub>
+</aliasConfig>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/updateForDataCaching.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/updateForDataCaching.xml
new file mode 100644
index 0000000000..bb64c2a290
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/updateForDataCaching.xml
@@ -0,0 +1,12 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+<changeSet author="j.goderbauer" id="6947b44d-0ef4-4fb6-a74d-f496d99b1e69">
+ <update tableName="ASYS_ALIASCONFIG">
+ <column name="XMLDATA" valueBlobFile="defaultBlob/_____configuration.xml"/>
+ <where>ID = ?</where>
+ <whereParams>
+ <param value="f4a33c35-5033-4699-b55a-9520b465b4c5" />
+ </whereParams>
+ </update>
+</changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/changelog.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/changelog.xml
index 0d2b50c2fc..bdcd0928c4 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/changelog.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/changelog.xml
@@ -1,8 +1,9 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <include relativeToChangelogFile="true" file="create_asys_notifications.xml"/>
- <include relativeToChangelogFile="true" file="create_asys_notificationcontents.xml"/>
- <include relativeToChangelogFile="true" file="create_asys_permission.xml"/>
- <include relativeToChangelogFile="true" file="create_asys_permissionset.xml"/>
- <include relativeToChangelogFile="true" file="create_asys_permissionaction.xml"/>
-</databaseChangeLog>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="notificationcenter/create_asys_notifications.xml"/>
+ <include relativeToChangelogFile="true" file="notificationcenter/create_asys_notificationcontents.xml"/>
+ <include relativeToChangelogFile="true" file="permission/create_asys_permission.xml"/>
+ <include relativeToChangelogFile="true" file="permission/create_asys_permissionset.xml"/>
+ <include relativeToChangelogFile="true" file="permission/create_asys_permissionaction.xml"/>
+ <include relativeToChangelogFile="true" file="aliasConfig/updateForDataCaching.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/notificationcenter/create_asys_notificationcontents.xml
similarity index 98%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
rename to .liquibase/_____SYSTEMALIAS/basic/2019.2/notificationcenter/create_asys_notificationcontents.xml
index 8cd8c16972..b5195dab42 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/notificationcenter/create_asys_notificationcontents.xml
@@ -1,22 +1,22 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="a.schindlbeck" id="6b25f062-fb39-4230-9348-b67ec5ec45a1">
- <createTable tableName="ASYS_NOTIFICATIONCONTENTS">
- <column name="CONTENTID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_ASYS_NOTIFICATIONCONTENTS_CONTENTID"/>
- </column>
- <column name="BACKPACK" type="CLOB"/>
- <column name="CAPTION" type="VARCHAR(512)"/>
- <column name="CREATIONDATE" type="TIMESTAMP"/>
- <column name="DESCRIPTION" type="VARCHAR(1023)"/>
- <column name="FORCEDPRIORITY" type="VARCHAR(15)"/>
- <column name="ICON_INFO" type="VARCHAR(1023)"/>
- <column name="LIFETIME" type="BIGINT"/>
- <column name="LINK_INFO" type="VARCHAR(1023)"/>
- <column name="ORIGINATORNAME" type="VARCHAR(63)"/>
- <column name="RECIPIENTUSERIDS" type="CLOB"/>
- <column name="TYPECODE" type="VARCHAR(63)"/>
- <column name="VERSION" type="INTEGER"/>
- </createTable>
-</changeSet>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+<changeSet author="a.schindlbeck" id="6b25f062-fb39-4230-9348-b67ec5ec45a1">
+ <createTable tableName="ASYS_NOTIFICATIONCONTENTS">
+ <column name="CONTENTID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_ASYS_NOTIFICATIONCONTENTS_CONTENTID"/>
+ </column>
+ <column name="BACKPACK" type="CLOB"/>
+ <column name="CAPTION" type="VARCHAR(512)"/>
+ <column name="CREATIONDATE" type="TIMESTAMP"/>
+ <column name="DESCRIPTION" type="VARCHAR(1023)"/>
+ <column name="FORCEDPRIORITY" type="VARCHAR(15)"/>
+ <column name="ICON_INFO" type="VARCHAR(1023)"/>
+ <column name="LIFETIME" type="BIGINT"/>
+ <column name="LINK_INFO" type="VARCHAR(1023)"/>
+ <column name="ORIGINATORNAME" type="VARCHAR(63)"/>
+ <column name="RECIPIENTUSERIDS" type="CLOB"/>
+ <column name="TYPECODE" type="VARCHAR(63)"/>
+ <column name="VERSION" type="INTEGER"/>
+ </createTable>
+</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notifications.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/notificationcenter/create_asys_notifications.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notifications.xml
rename to .liquibase/_____SYSTEMALIAS/basic/2019.2/notificationcenter/create_asys_notifications.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permission.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permission.xml
similarity index 98%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permission.xml
rename to .liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permission.xml
index 66b4bfee09..ab5313229a 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permission.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permission.xml
@@ -1,13 +1,13 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="s.leipold" id="746f6e0c-3eab-4424-867f-4cf4fb4c45bb">
- <createTable tableName="ASYS_PERMISSION">
- <column name="ASYS_PERMISSIONID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSION_ID"/>
- </column>
- <column name="ASYS_PERMISSIONSET_ID" type="CHAR(36)"/>
- <column name="COND" type="VARCHAR(255)"/>
- <column name="CONDTYPE" type="BOOLEAN"/>
- </createTable>
- </changeSet>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.leipold" id="746f6e0c-3eab-4424-867f-4cf4fb4c45bb">
+ <createTable tableName="ASYS_PERMISSION">
+ <column name="ASYS_PERMISSIONID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSION_ID"/>
+ </column>
+ <column name="ASYS_PERMISSIONSET_ID" type="CHAR(36)"/>
+ <column name="COND" type="VARCHAR(255)"/>
+ <column name="CONDTYPE" type="BOOLEAN"/>
+ </createTable>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionaction.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionaction.xml
similarity index 98%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionaction.xml
rename to .liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionaction.xml
index 746ab27402..5b52530e4d 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionaction.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionaction.xml
@@ -1,12 +1,12 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="s.leipold" id="20241de4-091e-4093-8055-c87c172e5788">
- <createTable tableName="ASYS_PERMISSIONACTION">
- <column name="ASYS_PERMISSIONACTIONID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONACTION_ID"/>
- </column>
- <column name="ASYS_PERMISSION_ID" type="CHAR(36)"/>
- <column name="ACTION" type="VARCHAR(255)"/>
- </createTable>
- </changeSet>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.leipold" id="20241de4-091e-4093-8055-c87c172e5788">
+ <createTable tableName="ASYS_PERMISSIONACTION">
+ <column name="ASYS_PERMISSIONACTIONID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONACTION_ID"/>
+ </column>
+ <column name="ASYS_PERMISSION_ID" type="CHAR(36)"/>
+ <column name="ACTION" type="VARCHAR(255)"/>
+ </createTable>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionset.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionset.xml
similarity index 98%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionset.xml
rename to .liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionset.xml
index 31583db7ce..70f767b181 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionset.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionset.xml
@@ -1,15 +1,15 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="s.leipold" id="8a125d57-48c6-4d2e-9568-d5e66f72a702">
- <createTable tableName="ASYS_PERMISSIONSET">
- <column name="ASYS_PERMISSIONSETID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONSET_ID"/>
- </column>
- <column name="ASYS_PERMISSIONSET_ID" type="CHAR(36)"/>
- <column name="ENTITY_ID" type="VARCHAR(255)"/>
- <column name="ROLE_ID" type="VARCHAR(255)"/>
- <column name="FIELD_ID" type="VARCHAR(255)"/>
- <column name="ACCESSTYPE" type="CHAR(1)"/>
- </createTable>
- </changeSet>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.leipold" id="8a125d57-48c6-4d2e-9568-d5e66f72a702">
+ <createTable tableName="ASYS_PERMISSIONSET">
+ <column name="ASYS_PERMISSIONSETID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONSET_ID"/>
+ </column>
+ <column name="ASYS_PERMISSIONSET_ID" type="CHAR(36)"/>
+ <column name="ENTITY_ID" type="VARCHAR(255)"/>
+ <column name="ROLE_ID" type="VARCHAR(255)"/>
+ <column name="FIELD_ID" type="VARCHAR(255)"/>
+ <column name="ACCESSTYPE" type="CHAR(1)"/>
+ </createTable>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/changelog.xml b/.liquibase/_____SYSTEMALIAS/changelog.xml
index eff6802896..b7e91b535e 100644
--- a/.liquibase/_____SYSTEMALIAS/changelog.xml
+++ b/.liquibase/_____SYSTEMALIAS/changelog.xml
@@ -1,7 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <include file="basic/init/init.xml"/>
- <include file="basic/init/init.xml"/>
- <include file="basic/2019.2/changelog.xml"/>
- <include file="basic/init/system_aliasTestdata.xml"/>
-</databaseChangeLog>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include file="basic/init/init.xml"/>
+ <include file="basic/init/system_aliasTestdata.xml"/>
+ <include file="basic/2019.2/changelog.xml"/>
+</databaseChangeLog>
diff --git a/process/DataCaching_lib/process.js b/process/DataCaching_lib/process.js
index c3fa505114..f77ae2ba0c 100644
--- a/process/DataCaching_lib/process.js
+++ b/process/DataCaching_lib/process.js
@@ -1,4 +1,5 @@
import("system.vars");
+import("system.project");
/**
* object for caching data if possible on the targetsystem
@@ -17,7 +18,7 @@ function CachedData(pIdentifiyingName, pKeepPerLanguage, pLocaleOverride)
{
this.identifyingName = pIdentifiyingName;
this.keepPerLanguage = (pKeepPerLanguage == true);
-
+
this.runningOnServer = vars.getString("$sys.isserver") == "true";
if (pLocaleOverride)
this.locale = pLocaleOverride;
@@ -59,8 +60,15 @@ CachedData.make = function(pIdentifiyingName, pKeepPerLanguage, pDataCallbackFun
*/
CachedData.prototype.load = function(pDataCallbackFunction)
{
+ var cachingEnabled = true;
+
//currently it's not possible to cache the data within the serer-context, so instead the Data-function is called everytime
if (this.runningOnServer)
+ cachingEnabled = false;
+ else if (project.getInstanceConfigValue("custom.dataCaching.client.forceDisable") == true)
+ cachingEnabled = false;
+
+ if (!cachingEnabled)
return pDataCallbackFunction.call(this, this.keepPerLanguage, this.locale);
else
{
--
GitLab