Merge remote-tracking branch 'remotes/ProjectUU/ImporterTest' into ProjectUU/master

# Conflicts:
#	process/upgrade_ImporterCustomMappingFunctions_lib/process.js

aliasDefinition/ADITO5/ADITO5.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<aliasDefinition 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/aliasDefinition/1.2.0">
+  <name>ADITO5</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <datasourceType v="0" />
+  <aliasDefinitionSub>
+    <aliasDefDb>
+      <entityGroup>
+        <name>entityGroup</name>
+      </entityGroup>
+    </aliasDefDb>
+  </aliasDefinitionSub>
+</aliasDefinition>

process/upgrade_ImporterCustomMappingFunctions_lib/process.js

@@ -1868,19 +1868,18 @@ function getConfig_ASYS_USERS()
 //@TODO
 function getConfig_AOSYS_CALENDAR_RIGHTS() {
     return {
-        truncateTable: "AB_PERMISSIONCALENDAR",
         DataQuery:
             "SELECT"
             + " AOSYS_CALENDAR_RIGHTSID,"
-            + " LOGIN,"
-            + " HASRIGHTFOR,"
-            + " case when THEMEID is not null then 'DEPARTMENT' else 'USER' end"
-            + " EVENT_RIGHTS"
+            + " LOGIN," //@TODO change from Login to ID
+            + " HASRIGHTFOR," //@TODO change from Login to ID
+            + " case when THEMEID  is not null then 'DEPARTMENT' else 'USER' end"
+            + " EVENT_RIGHTS," //@TODO change Number to Key
             + " FROM ADITO.AOSYS_CALENDAR_RIGHTS"
             + " left join THEME on THEMEID = HASRIGHTFOR",
     
         AliasFrom: aliasFrom,
-        AliasTo: DataAliasTo,
+        AliasTo: systemAliasTo,
         ImportCommand: "insert+update",
         
         Mapping: [

system/default/default.aod

@@ -2,7 +2,8 @@
 <system 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/system/1.1.0">
   <name>default</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <serverConfigPath>$ADITODATA/config/serverconfig_default.xml</serverConfigPath>
+  <serverConfigPath>$ADITODATA/config/adito-upgrade.dev.c2.adito.cloud_serverconfig_system.xml</serverConfigPath>
+  <tunnelConfigPath>$ADITODATA/config/adito-upgrade.dev.c2.adito.cloud_tunnelconfig.xml</tunnelConfigPath>
   <aditoHomePath>$ADITOHOME</aditoHomePath>
   <aditoDataPath>$PROJECTHOME/data</aditoDataPath>
   <loginUser>admin</loginUser>