From a38dd6592d9495f2032e168fb518b143c098d207 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 20 Aug 2019 15:34:56 +0200
Subject: [PATCH] put all system alias liquibase into init folder, update/add
timers tables, update db-version
---
.../aliasConfig/addMailingAliases.xml | 29 ------------------
.../defaultBlob/_____configuration.xml | 30 -------------------
.../aliasConfig/updateForDataCaching.xml | 12 --------
.../basic/2019.1.4/changelog.xml | 10 -------
.../create_asys_notifications.xml | 18 -----------
.../data/defaultBlob/_____configuration.xml | 12 ++++++--
.../defaultBlob/_____system_sysdb_version.xml | 2 +-
.../init/data/defaultBlob/data_alias.xml | 2 +-
.../data}/defaultBlob/defaultDbRepository.xml | 2 +-
.../data}/defaultBlob/mailServerIMAP.xml | 0
.../init/data/insert_asys_aliasconfig.xml | 25 ++++++++++++++++
.../basic/init/data/insert_asys_system.xml | 2 +-
.../_____SYSTEMALIAS/basic/init/init.xml | 6 ++++
.../create_asys_notificationcontents.xml | 0
.../init/struct/create_asys_notifications.xml | 21 ++++---------
.../struct}/create_asys_permission.xml | 0
.../struct}/create_asys_permissionaction.xml | 0
.../struct}/create_asys_permissionset.xml | 0
.../basic/init/struct/create_asys_timers.xml | 17 +++++++----
.../struct/create_asys_timers_serverruns.xml | 18 +++++++++++
.liquibase/_____SYSTEMALIAS/changelog.xml | 1 -
21 files changed, 79 insertions(+), 128 deletions(-)
delete mode 100644 .liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/addMailingAliases.xml
delete mode 100644 .liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/_____configuration.xml
delete mode 100644 .liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/updateForDataCaching.xml
delete mode 100644 .liquibase/_____SYSTEMALIAS/basic/2019.1.4/changelog.xml
delete mode 100644 .liquibase/_____SYSTEMALIAS/basic/2019.1.4/notificationcenter/create_asys_notifications.xml
rename .liquibase/_____SYSTEMALIAS/basic/{2019.1.4/aliasConfig => init/data}/defaultBlob/defaultDbRepository.xml (84%)
rename .liquibase/_____SYSTEMALIAS/basic/{2019.1.4/aliasConfig => init/data}/defaultBlob/mailServerIMAP.xml (100%)
rename .liquibase/_____SYSTEMALIAS/basic/{2019.1.4/notificationcenter => init/struct}/create_asys_notificationcontents.xml (100%)
rename .liquibase/_____SYSTEMALIAS/basic/{2019.1.4/permission => init/struct}/create_asys_permission.xml (100%)
rename .liquibase/_____SYSTEMALIAS/basic/{2019.1.4/permission => init/struct}/create_asys_permissionaction.xml (100%)
rename .liquibase/_____SYSTEMALIAS/basic/{2019.1.4/permission => init/struct}/create_asys_permissionset.xml (100%)
create mode 100644 .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timers_serverruns.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/addMailingAliases.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/addMailingAliases.xml
deleted file mode 100644
index b33a7b7db8..0000000000
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/addMailingAliases.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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="autogenerated" id="667e73e0-cf8e-48c8-a75e-022689462cda">
- <insert tableName="ASYS_ALIASCONFIG">
- <column name="ALIASID" value="mailServerIMAP"/>
- <column name="DATE_EDIT" valueDate="2019-06-25T01:14:32"/>
- <column name="DATE_NEW" valueDate="2019-06-25T01:14:32"/>
- <column name="ID" value="530a2f77-c1c3-4d93-b1fe-41ebe7410695"/>
- <column name="KIND" valueNumeric="105"/>
- <column name="NAME" value="mailServerIMAP_default"/>
- <column name="SERVERID" value="default"/>
- <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
- <column name="USER_NEW" value="_____DESIGNERANONYM"/>
- <column name="XMLDATA" valueBlobFile="defaultBlob/mailServerIMAP.xml"/>
- </insert>
- <insert tableName="ASYS_ALIASCONFIG">
- <column name="ALIASID" value="defaultDbRepository"/>
- <column name="DATE_EDIT" valueDate="2019-06-25T01:14:46"/>
- <column name="DATE_NEW" valueDate="2019-06-25T01:14:35"/>
- <column name="ID" value="b2ae3180-afd2-493c-a17b-16038e3a3860"/>
- <column name="KIND" valueNumeric="105"/>
- <column name="NAME" value="defaultDbRepository_default"/>
- <column name="SERVERID" value="default"/>
- <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
- <column name="USER_NEW" value="_____DESIGNERANONYM"/>
- <column name="XMLDATA" valueBlobFile="defaultBlob/defaultDbRepository.xml"/>
- </insert>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/_____configuration.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/_____configuration.xml
deleted file mode 100644
index 7743c4ffe8..0000000000
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/_____configuration.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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" />
- <mailGlobalEnabled v="true" />
- <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="false" />
- </customBooleanProperty>
- </customProperties>
- </aliasSubInstanceConfiguration>
- </aliasConfigSub>
-</aliasConfig>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/updateForDataCaching.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/updateForDataCaching.xml
deleted file mode 100644
index bb64c2a290..0000000000
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/updateForDataCaching.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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.1.4/changelog.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/changelog.xml
deleted file mode 100644
index b83ccbbf0d..0000000000
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/changelog.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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"/>
- <include relativeToChangelogFile="true" file="aliasConfig/addMailingAliases.xml"/>
-</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/notificationcenter/create_asys_notifications.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/notificationcenter/create_asys_notifications.xml
deleted file mode 100644
index 5e629589c5..0000000000
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/notificationcenter/create_asys_notifications.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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="98f057b6-0140-4edd-b08d-9cc7cf178bab">
- <!---
- its ok to drop the old ASYS_NOTIFICATIONS due to new version
- -->
- <dropTable tableName="ASYS_NOTIFICATIONS"/>
- <createTable tableName="ASYS_NOTIFICATIONS">
- <column name="ID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_ASYS_NOTIFICATIONS_ID"/>
- </column>
- <column name="CONTENTID" type="CHAR(36)"/>
- <column name="STATE" type="VARCHAR(15)"/>
- <column name="USERID" type="VARCHAR(63)"/>
- <column name="RESOLVEDPRIORITY" type="VARCHAR(15)"/>
- </createTable>
-</changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
index a57bd0f042..d7c35865a1 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
@@ -1,5 +1,5 @@
<?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">
+<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.2">
<name>_____CONFIGURATION</name>
<serverId>default</serverId>
<definitionName>_____CONFIGURATION</definitionName>
@@ -10,13 +10,21 @@
<loggingConsoleEnabled v="true" />
<loggingFileEnabled v="true" />
<loggingRemoteEnabled v="false" />
+ <mailGlobalEnabled v="true" />
<neonVaadinClientEnabled v="true" />
<neonDisableConnectionSecurity v="false" />
<neonUseDummyKeystore v="true" />
<securityConnectionSSLEnabled v="true" />
<securitySSLDisableCertificateCheck v="true" />
<telephonyEnabled v="true" />
- <telephonyProvider>Asterisk;Server=sip.adito.de</telephonyProvider>
+ <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="false" />
+ </customBooleanProperty>
+ </customProperties>
</aliasSubInstanceConfiguration>
</aliasConfigSub>
</aliasConfig>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
index ff598ae4e9..02dd5dea94 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<sysDbVersion xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/sysDbVersion/1.2.0">
<name>_____SYSTEM_SYSDB_VERSION</name>
- <systemDbVersion>2.7.0</systemDbVersion>
+ <systemDbVersion>2.7.2</systemDbVersion>
</sysDbVersion>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
index e6eb125c83..1eb782d8f9 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
@@ -1,5 +1,5 @@
<?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">
+<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.2">
<name>f50ee138-12d9-420d-a4f9-9b8257e207e4</name>
<description>jdbc:derby://localhost:1527/basic_data</description>
<serverId>default</serverId>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/defaultDbRepository.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/defaultDbRepository.xml
similarity index 84%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/defaultDbRepository.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/defaultDbRepository.xml
index d9ec835231..52ece96785 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/defaultDbRepository.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/defaultDbRepository.xml
@@ -1,5 +1,5 @@
<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.1">
+<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.2">
<name>defaultDbRepository_default</name>
<serverId>default</serverId>
<definitionName>defaultDbRepository</definitionName>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/mailServerIMAP.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/mailServerIMAP.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/mailServerIMAP.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/mailServerIMAP.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
index f5c254801a..d2a5949275 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
@@ -27,6 +27,31 @@
<column name="XMLDATA" valueBlobFile="defaultBlob/data_alias.xml"/>
</insert>
+ <insert tableName="ASYS_ALIASCONFIG">
+ <column name="ALIASID" value="mailServerIMAP"/>
+ <column name="DATE_EDIT" valueDate="2019-06-25T01:14:32"/>
+ <column name="DATE_NEW" valueDate="2019-06-25T01:14:32"/>
+ <column name="ID" value="530a2f77-c1c3-4d93-b1fe-41ebe7410695"/>
+ <column name="KIND" valueNumeric="105"/>
+ <column name="NAME" value="mailServerIMAP_default"/>
+ <column name="SERVERID" value="default"/>
+ <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
+ <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+ <column name="XMLDATA" valueBlobFile="defaultBlob/mailServerIMAP.xml"/>
+ </insert>
+ <insert tableName="ASYS_ALIASCONFIG">
+ <column name="ALIASID" value="defaultDbRepository"/>
+ <column name="DATE_EDIT" valueDate="2019-06-25T01:14:46"/>
+ <column name="DATE_NEW" valueDate="2019-06-25T01:14:35"/>
+ <column name="ID" value="b2ae3180-afd2-493c-a17b-16038e3a3860"/>
+ <column name="KIND" valueNumeric="105"/>
+ <column name="NAME" value="defaultDbRepository_default"/>
+ <column name="SERVERID" value="default"/>
+ <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
+ <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+ <column name="XMLDATA" valueBlobFile="defaultBlob/defaultDbRepository.xml"/>
+ </insert>
+
<rollback>
<delete tableName="ASYS_ALIASCONFIG">
<where>ID = ?</where>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
index ae1ca17581..b4a2c1bf0a 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
@@ -7,7 +7,7 @@
<column name="DATE_NEW" valueDate="2018-05-24T14:53:57.763"/>
<column name="KIND" valueNumeric="600"/>
<column name="NAME" value="_____SYSTEM_SYSDB_VERSION"/>
- <column name="TITLE" value="2.7.0"/>
+ <column name="TITLE" value="2.7.2"/>
<column name="USER_EDIT" value="_____DESIGNERANONYM"/>
<column name="USER_NEW" value="_____DESIGNERANONYM"/>
<column name="XMLDATA" valueBlobFile="defaultBlob/_____system_sysdb_version.xml"/>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
index 8aa7a41d3b..3ae8bcc7c4 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
@@ -9,9 +9,15 @@
<include relativeToChangelogFile="true" file="struct/create_asys_system.xml"/>
<include relativeToChangelogFile="true" file="struct/create_asys_timer.xml"/>
<include relativeToChangelogFile="true" file="struct/create_asys_timers.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_timers_serverruns.xml"/>
<include relativeToChangelogFile="true" file="struct/create_asys_users.xml"/>
<include relativeToChangelogFile="true" file="struct/create_asys_calendarbackend.xml"/>
<include relativeToChangelogFile="true" file="struct/create_asys_calendarlink.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_notifications.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_notificationcontents.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_permission.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_permissionset.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_permissionaction.xml"/>
<include relativeToChangelogFile="true" file="data/insert_asys_aliasconfig.xml"/>
<include relativeToChangelogFile="true" file="data/insert_asys_system.xml"/>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/notificationcenter/create_asys_notificationcontents.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.1.4/notificationcenter/create_asys_notificationcontents.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
index bd57a5ed46..0175584524 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
@@ -1,25 +1,14 @@
<?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.hoermann" id="98f057b6-0140-4edd-b08d-9cc7cf178bab">
+<changeSet author="a.schindlbeck" id="98f057b6-0140-4edd-b08d-9cc7cf178bab">
<createTable tableName="ASYS_NOTIFICATIONS">
<column name="ID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_ASYS_NOTIFICATIONS_ID"/>
</column>
- <column name="BACKPACK" type="CLOB"/>
- <column name="CAPTION" type="VARCHAR(512)"/>
- <column name="CONTENTID" type="VARCHAR(512)"/>
- <column name="CREATIONDATE" type="BIGINT"/>
- <column name="DESCRIPTION" type="VARCHAR(1023)"/>
- <column name="FORCEDPRIORITY" type="INTEGER"/>
- <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="STATE" type="VARCHAR(16)"/>
- <column name="TYPECODE" type="VARCHAR(63)"/>
+ <column name="CONTENTID" type="CHAR(36)"/>
+ <column name="STATE" type="VARCHAR(15)"/>
<column name="USERID" type="VARCHAR(63)"/>
- <column name="VERSION" type="INTEGER"/>
+ <column name="RESOLVEDPRIORITY" type="VARCHAR(15)"/>
</createTable>
</changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/permission/create_asys_permission.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_permission.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.1.4/permission/create_asys_permission.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_permission.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/permission/create_asys_permissionaction.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_permissionaction.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.1.4/permission/create_asys_permissionaction.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_permissionaction.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/permission/create_asys_permissionset.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_permissionset.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.1.4/permission/create_asys_permissionset.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_permissionset.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timers.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timers.xml
index fce66d6999..f09fdfb318 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timers.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timers.xml
@@ -5,13 +5,18 @@
<column name="TIMERID" type="VARCHAR(127)">
<constraints primaryKey="true" primaryKeyName="PK_ASYS_TIMERS_TIMERID"/>
</column>
- <column name="LASTRUN" type="DATETIME"/>
- <column name="STARTTIME" type="DATETIME"/>
- <column name="INTERVALVALUE" type="INTEGER"/>
+
+ <column name="ACTIVE" type="VARCHAR(5)"/>
+ <column name="INTERVALDESCRIPTION" type="VARCHAR(255)"/>
<column name="INTERVALUNIT" type="INTEGER"/>
+ <column name="INTERVALVALUE" type="INTEGER"/>
+ <column name="KEEPJDITO" type="VARCHAR(5)"/>
+ <column name="LASTRUN" type="DATETIME"/>
<column name="PROCESSNAME" type="VARCHAR(255)"/>
- <column name="INTERVALDESCRIPTION" type="VARCHAR(255)"/>
- <column name="ACTIVE" type="VARCHAR(5)"/>
+ <column name="PROCESSUSER" type="VARCHAR(255)"/>
+ <column name="STARTTIME" type="DATETIME"/>
+ <column name="THREADPRIORITY" type="INTEGER"/>
+ <column name="TIMERTYPE" type="INTEGER"/>
</createTable>
</changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timers_serverruns.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timers_serverruns.xml
new file mode 100644
index 0000000000..5c5a397fcd
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timers_serverruns.xml
@@ -0,0 +1,18 @@
+<?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="m.sieber" id="">
+ <createTable tableName="ASYS_TIMERS_SERVERRUNS">
+ <column name="SERVERID" type="VARCHAR(127)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="TIMERID" type="VARCHAR(127)">
+ <constraints nullable="false"/>
+ </column>
+
+ <column name="LASTRUN" type="DATETIME"/>
+ </createTable>
+ <addPrimaryKey tableName="ASYS_TIMERS_SERVERRUNS"
+ columnNames="SERVERID, TIMERID"
+ constraintName="PK_ASYS_TIMERS_SERVERRUNS_SERVERID_TIMERID"/>
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/changelog.xml b/.liquibase/_____SYSTEMALIAS/changelog.xml
index f2886409da..6d6c244604 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 relativeToChangelogFile="true" file="basic/init/init.xml"/>
- <include relativeToChangelogFile="true" file="basic/2019.1.4/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
</databaseChangeLog>
--
GitLab