diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 3d05482a243139b0abac8df0ccf520564471f78d..af578ce4ac552ecf6fed21d9463c3bf19059bfac 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -142,4 +142,6 @@
<include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic_notDerby.xml" />
<include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic_Derby.xml" />
<include relativeToChangelogFile="true" file="update_Milestone_to_new_Keyword.xml" />
+
+ <include relativeToChangelogFile="true" file="data/example_person/PERSON_admin.xml" context="example"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_admin.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_admin.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0bd25176811a68603ed941db223b84ea0592c6d7
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_admin.xml
@@ -0,0 +1,60 @@
+<?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="d750c022-e34c-4903-8146-bd89121c0214">
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="b16282bd-254e-4569-a56e-675449821467"/>
+ <column name="FIRSTNAME" value="Tim"/>
+ <column name="MIDDLENAME"/>
+ <column name="LASTNAME" value="Admin"/>
+ <column name="SALUTATION" value="Herr"/>
+ <column name="DATEOFBIRTH" valueDate="1993-05-07"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <insert tableName="CONTACT">
+ <column name="RELATIONSHIP" valueNumeric="1"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="PERSON_ID" value="b16282bd-254e-4569-a56e-675449821467"/>
+ <column name="CONTACTID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+ <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="3ccc54d5-dfb0-4da9-a0a0-472025f65994"/>
+ <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+ <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="ADDR" value="Admin@domain.local"/>
+ <column name="STANDARD" valueNumeric="1"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <rollback>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
+ <whereParams>
+ <param value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
+ </whereParams>
+ </delete>
+ <delete tableName="COMMUNICATION">
+ <where>CONTACTID = ?</where>
+ <whereParams>
+ <param value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
+ </whereParams>
+ </delete>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
+ <whereParams>
+ <param value="b16282bd-254e-4569-a56e-675449821467" />
+ </whereParams>
+ </delete>
+ <delete tableName="ADDRESS">
+ <where>CONTACT_ID = ?</where>
+ <whereParams>
+ <param value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
+ </whereParams>
+ </delete>
+ </rollback>
+</changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
index 0808967704be0c95f53d4cad4524a9660e07eb8a..a57bd0f04271547aaf28e4f103e6a625bd2d8804 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.0.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.0.7">
+<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>
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 59bf0767b66fe17465aa47e845310a64b932ea6d..263bf76d5d876fa69aaabaef1f06f01b5e4e1c01 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.5.1</systemDbVersion>
+ <systemDbVersion>2.6.0</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 96e374b63bfba36595e9eef04af49ece136932a9..e6eb125c832854bf0e6dd3e0c5f88d2ee198db51 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.0.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.0.7">
+<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>f50ee138-12d9-420d-a4f9-9b8257e207e4</name>
<description>jdbc:derby://localhost:1527/basic_data</description>
<serverId>default</serverId>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
index 5065651e3bced3f53c7fcd357f402fba4ba1384c..38d99e05952657760911852cb369a4853b78e69e 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.5.1"/>
+ <column name="TITLE" value="2.6.0"/>
<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/data/insert_asys_users-admin.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
index 985b5d19534f4f4ffcc60ecd673f6c907f1e0730..33f7425c15c97e76ac83a3a172c4c79849fb88bb 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
@@ -10,6 +10,15 @@
<column name="PROPKEY" value="lastModified"/>
<column name="PROPVAL" value="1544193908535"/>
</insert>
+ <insert tableName="ASYS_USERS">
+ <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+ <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+ <column name="GROUPID" value="BASIC"/>
+ <column name="ID" value="cdb34f95-e414-4807-bbdb-f369138ee49f"/>
+ <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+ <column name="PROPKEY" value="contactID"/>
+ <column name="PROPVAL" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+ </insert>
<insert tableName="ASYS_USERS">
<column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
<column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
@@ -19,6 +28,15 @@
<column name="PROPKEY" value="name"/>
<column name="PROPVAL" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
</insert>
+ <insert tableName="ASYS_USERS">
+ <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+ <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+ <column name="GROUPID" value="BASIC"/>
+ <column name="ID" value="c17c88f5-74e2-44a1-ae68-8130918b43d3"/>
+ <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+ <column name="PROPKEY" value="isActive"/>
+ <column name="PROPVAL" value="true"/>
+ </insert>
<insert tableName="ASYS_USERS">
<column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
<column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
@@ -28,6 +46,15 @@
<column name="PROPKEY" value="title"/>
<column name="PROPVAL" value="Admin"/>
</insert>
+ <insert tableName="ASYS_USERS">
+ <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+ <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+ <column name="GROUPID" value="PERSONAL"/>
+ <column name="ID" value="93c88dff-a6b0-49ce-b7b4-e474b7ca7fb6"/>
+ <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+ <column name="PROPKEY" value="firstname"/>
+ <column name="PROPVAL" value="Tim"/>
+ </insert>
<insert tableName="ASYS_USERS">
<column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
<column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
@@ -35,7 +62,7 @@
<column name="ID" value="f63d0946-3960-43bb-9888-4c36d962f955"/>
<column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
<column name="PROPKEY" value="lastname"/>
- <column name="PROPVAL" value="Administrator"/>
+ <column name="PROPVAL" value="Admin"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
index 4e94f2543871caa8a6c85f12715d0856d3f6a6e2..d29b9203a5b0089545e87bd7641479f7fa4003e9 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
@@ -1,18 +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">
- <include file="struct/create_asys_aliasconfig.xml"/>
- <include file="struct/create_asys_binaries.xml"/>
- <include file="struct/create_asys_dashletconfigurations.xml"/>
- <include file="struct/create_asys_dashlets.xml"/>
- <include file="struct/create_asys_notifications.xml"/>
- <include file="struct/create_asys_sequences.xml"/>
- <include file="struct/create_asys_system.xml"/>
- <include file="struct/create_asys_timer.xml"/>
- <include file="struct/create_asys_users.xml"/>
- <include file="struct/create_asys_calendarbackend.xml"/>
- <include file="struct/create_asys_calendarlink.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_aliasconfig.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_binaries.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_dashletconfigurations.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_dashlets.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_notifications.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_sequences.xml"/>
+ <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_users.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_calendarbackend.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_calendarlink.xml"/>
- <include file="data/insert_asys_aliasconfig.xml"/>
- <include file="data/insert_asys_system.xml"/>
- <include file="data/insert_asys_users-admin.xml"/>
+ <include relativeToChangelogFile="true" file="data/insert_asys_aliasconfig.xml"/>
+ <include relativeToChangelogFile="true" file="data/insert_asys_system.xml"/>
+ <include relativeToChangelogFile="true" file="data/insert_asys_users-admin.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml b/.liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
index 12e4b957ade3bd0f87acb1decb681cb98398f0df..9471a52c15d6bcf528b3d86b509fba763553a793 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.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">
- <include file="data/example_asys_users/Birgit_Leicht.xml"/>
- <include file="data/example_asys_binaries/Birgit_Leicht_Image.xml"/>
- <include file="data/example_asys_users/Harold_Smith.xml"/>
- <include file="data/example_asys_binaries/Harold_Smith_Image.xml"/>
- <include file="data/example_asys_users/Herbert_Obermeier.xml"/>
- <include file="data/example_asys_binaries/Herbert_Obermeier_Image.xml"/>
- <include file="data/example_asys_users/Lisa_Sommer.xml"/>
- <include file="data/example_asys_binaries/Lisa_Sommer_Image.xml"/>
- <include file="data/example_asys_users/Susanne_Lustig.xml"/>
- <include file="data/example_asys_binaries/Susanne_Lustig_Image.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_asys_users/Birgit_Leicht.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_asys_binaries/Birgit_Leicht_Image.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_asys_users/Harold_Smith.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_asys_binaries/Harold_Smith_Image.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_asys_users/Herbert_Obermeier.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_asys_binaries/Herbert_Obermeier_Image.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_asys_users/Lisa_Sommer.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_asys_binaries/Lisa_Sommer_Image.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_asys_users/Susanne_Lustig.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_asys_binaries/Susanne_Lustig_Image.xml"/>
</databaseChangeLog>