COMP: adjus references for moved 'Services' and add Update Steps.

.gitignore

@@ -31,7 +31,7 @@
 /db_template_writer.php
 /setup/sql/dbupdate_custom.php
 /install_client.php
-/Services/GlobalScreen/artifacts/global_screen_providers.php
+/components/ILIAS/GlobalScreen_/artifacts/global_screen_providers.php
 /Services/Style/System/data/data.php
 /Services/UICore/artifacts/ctrl_structure.php
 /Services/UICore/artifacts/ctrl_plugin_structure.php
@@ -67,7 +67,7 @@ phpstan-baseline.neon
 
 # File Delivery
 override.php
-Services/ResourceStorage/artifacts/flavour_data.php
+components/ILIAS/ResourceStorage_/artifacts/flavour_data.php
 Services/FileHandlingDemo
 src/FileDelivery/artifacts
 src/StaticURL/artifacts

cli/inc.header.php

@@ -32,5 +32,5 @@
 * @package ilias-core
 */
 
-require_once("Services/Init/classes/class.ilInitialisation.php");
+require_once("components/ILIAS/Init/classes/class.ilInitialisation.php");
 ilInitialisation::initILIAS();

cli/sso/index.php

@@ -26,7 +26,7 @@
 include_once './Services/Context/classes/class.ilContext.php';
 ilContext::init(ilContext::CONTEXT_APACHE_SSO);
 
-require_once("Services/Init/classes/class.ilInitialisation.php");
+require_once("components/ILIAS/Init/classes/class.ilInitialisation.php");
 ilInitialisation::initILIAS();
 
 $ilCtrl->setCmd('doApacheAuthentication');

components/ILIAS/ADT/test/ilServicesADTSuite.php

@@ -12,7 +12,7 @@ public static function suite(): ilServicesADTSuite
     {
         $suite = new ilServicesADTSuite();
 
-        include_once("./Services/ADT/test/ilADTFactoryTest.php");
+        include_once("./components/ILIAS/ADT/test/ilADTFactoryTest.php");
         $suite->addTestSuite(ilADTFactoryTest::class);
         return $suite;
     }

components/ILIAS/AccessControl/classes/Setup/class.ilAccessCustomRBACOperationAddedObjective.php

@@ -180,7 +180,7 @@ protected function initEnvironment(Setup\Environment $environment)
         $GLOBALS["DIC"]["ilDB"] = $db;
 
         if (!defined("ILIAS_ABSOLUTE_PATH")) {
-            define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 5));
+            define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 6));
         }
 
         return $DIC;

components/ILIAS/AccessControl/classes/class.ilAccessControlImporter.php

@@ -38,7 +38,7 @@ public function importXmlRepresentation(
         string $a_xml,
         ilImportMapping $a_mapping
     ): void {
-        $role_folder_id = $a_mapping->getMapping('Services/AccessControl', 'rolf', (string) 0);
+        $role_folder_id = $a_mapping->getMapping('components/ILIAS/AccessControl', 'rolf', (string) 0);
 
         $importer = new ilRoleXmlImporter((int) $role_folder_id);
         $importer->setXml($a_xml);

components/ILIAS/AccessControl/classes/class.ilAccessPermissionsStatusTableGUI.php

@@ -43,7 +43,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd)
         $this->disable('sort');
         $this->disable('numinfo');
         $this->setLimit(100);
-        $this->setRowTemplate("tpl.access_permissions_status_row.html", "Services/AccessControl");
+        $this->setRowTemplate("tpl.access_permissions_status_row.html", "components/ILIAS/AccessControl");
 
         $this->addColumn($this->lng->txt("status"), "status", "5%");
         $this->addColumn($this->lng->txt("operation"), "operation", "45%");

components/ILIAS/AccessControl/classes/class.ilAssignedUsersTableGUI.php

@@ -52,7 +52,7 @@ public function __construct(
         $this->setExternalSegmentation(true);
         $this->setEnableHeader(true);
         $this->setFormAction($this->ctrl->getFormAction($parent_obj, $parent_cmd));
-        $this->setRowTemplate('tpl.user_assignment_row.html', 'Services/AccessControl');
+        $this->setRowTemplate('tpl.user_assignment_row.html', 'components/ILIAS/AccessControl');
 
         $this->setEnableTitle(true);
         $this->setDefaultOrderField('login');

components/ILIAS/AccessControl/classes/class.ilAvailableRolesStatusTableGUI.php

@@ -44,7 +44,7 @@ public function __construct(?object $a_parent_obj, string $a_parent_cmd)
         $this->setEnableHeader(true);
         $this->disable('numinfo');
         $this->setLimit(100);
-        $this->setRowTemplate("tpl.available_roles_status_row.html", "Services/AccessControl");
+        $this->setRowTemplate("tpl.available_roles_status_row.html", "components/ILIAS/AccessControl");
 
         $this->addColumn($this->lng->txt("status"), "status", "5%");
         $this->addColumn($this->lng->txt("role"), "role", "32%");

components/ILIAS/AccessControl/classes/class.ilObjRoleGUI.php

@@ -469,7 +469,7 @@ protected function permObject(bool $a_show_admin_permissions = false): void
             'ADM_CONTENT',
             'adm_content',
             'tpl.rbac_template_permissions.html',
-            'Services/AccessControl'
+            'components/ILIAS/AccessControl'
         );
 
         $this->tpl->setVariable('PERM_ACTION', $this->ctrl->getFormAction($this));
@@ -929,7 +929,7 @@ public function userassignmentObject(): void
 
         $this->tabs_gui->setTabActive('user_assignment');
 
-        $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.rbac_ua.html', 'Services/AccessControl');
+        $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.rbac_ua.html', 'components/ILIAS/AccessControl');
 
         $tb = new ilToolbarGUI();
 

components/ILIAS/AccessControl/classes/class.ilObjRoleTemplateGUI.php

@@ -225,7 +225,7 @@ protected function permObject(): void
             'ADM_CONTENT',
             'adm_content',
             'tpl.rbac_template_permissions.html',
-            'Services/AccessControl'
+            'components/ILIAS/AccessControl'
         );
 
         $this->tpl->setVariable('PERM_ACTION', $this->ctrl->getFormAction($this));

components/ILIAS/AccessControl/classes/class.ilObjectPermissionStatusGUI.php

@@ -93,7 +93,7 @@ public function executeCommand(): void
      */
     public function perminfo(): void
     {
-        $tpl = new ilTemplate("tpl.info_layout.html", false, false, "Services/AccessControl");
+        $tpl = new ilTemplate("tpl.info_layout.html", false, false, "components/ILIAS/AccessControl");
 
         $tpl->setVariable("INFO_SUMMARY", $this->accessStatusInfo());
         $tpl->setVariable("INFO_PERMISSIONS", $this->accessPermissionsTable());

components/ILIAS/AccessControl/classes/class.ilObjectRolePermissionTableGUI.php

@@ -57,14 +57,14 @@ public function __construct(ilPermissionGUI $a_parent_obj, string $a_parent_cmd,
         $this->tree_path_ids = $this->tree->getPathId($this->ref_id);
 
         $tpl = $DIC->ui()->mainTemplate();
-        $tpl->addJavaScript('./Services/AccessControl/js/ilPermSelect.js');
+        $tpl->addJavaScript('./components/ILIAS/AccessControl/js/ilPermSelect.js');
 
         $this->setTitle($this->lng->txt('permission_settings'));
         $this->setEnableHeader(true);
         $this->disable('sort');
         $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, $a_parent_cmd));
         $this->disable('numinfo');
-        $this->setRowTemplate("tpl.obj_role_perm_row.html", "Services/AccessControl");
+        $this->setRowTemplate("tpl.obj_role_perm_row.html", "components/ILIAS/AccessControl");
         $this->setLimit(100);
         $this->setShowRowsSelector(false);
         $this->setDisableFilterHiding(true);

components/ILIAS/AccessControl/classes/class.ilObjectRoleTemplateOptionsTableGUI.php

@@ -52,7 +52,7 @@ public function __construct(
         $this->role_id = $a_role_id;
         $this->obj_ref_id = $a_obj_ref_id;
 
-        $this->setRowTemplate("tpl.obj_role_template_options_row.html", "Services/AccessControl");
+        $this->setRowTemplate("tpl.obj_role_template_options_row.html", "components/ILIAS/AccessControl");
         $this->setLimit(100);
         $this->setShowRowsSelector(false);
         $this->setDisableFilterHiding(true);

components/ILIAS/AccessControl/classes/class.ilObjectRoleTemplatePermissionTableGUI.php

@@ -64,7 +64,7 @@ public function __construct(
         $this->ref_id = $a_ref_id;
         $this->role_id = $a_role_id;
 
-        $this->setRowTemplate("tpl.obj_role_template_perm_row.html", "Services/AccessControl");
+        $this->setRowTemplate("tpl.obj_role_template_perm_row.html", "components/ILIAS/AccessControl");
         $this->setLimit(100);
         $this->setShowRowsSelector(false);
         $this->setDisableFilterHiding(true);

components/ILIAS/AccessControl/classes/class.ilPermissionGUI.php

@@ -581,7 +581,7 @@ protected function doImportRole(): void
                 // For global roles set import id to parent of current ref_id (adm)
                 $imp = new ilImport($this->getCurrentObject()->getRefId());
                 $imp->getMapping()->addMapping(
-                    'Services/AccessControl',
+                    'components/ILIAS/AccessControl',
                     'rolf',
                     '0',
                     (string) $this->getCurrentObject()->getRefId()

components/ILIAS/AccessControl/classes/class.ilRbacAdmin.php

@@ -211,7 +211,7 @@ public function assignUser(int $a_rol_id, int $a_usr_id): void
         if (!$alreadyAssigned) {
             ilLoggerFactory::getInstance()->getLogger('ac')->debug('Raise event assign user');
             $GLOBALS['DIC']['ilAppEventHandler']->raise(
-                'Services/AccessControl',
+                'components/ILIAS/AccessControl',
                 'assignUser',
                 [
                     'obj_id' => $obj_id,
@@ -244,7 +244,7 @@ public function deassignUser(int $a_rol_id, int $a_usr_id): void
             $type = ilObject::_lookupType($obj_id);
 
             ilLoggerFactory::getInstance()->getLogger('ac')->debug('Raise event deassign user');
-            $GLOBALS['DIC']['ilAppEventHandler']->raise('Services/AccessControl', 'deassignUser', [
+            $GLOBALS['DIC']['ilAppEventHandler']->raise('components/ILIAS/AccessControl', 'deassignUser', [
                 'obj_id' => $obj_id,
                 'usr_id' => $a_usr_id,
                 'role_id' => $a_rol_id,

components/ILIAS/AccessControl/classes/class.ilRbacLogTableGUI.php

@@ -51,7 +51,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd, int $a_r
         $this->setExternalSegmentation(true);
         $this->setEnableHeader(true);
         $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, $a_parent_cmd));
-        $this->setRowTemplate('tpl.rbac_log_row.html', 'Services/AccessControl');
+        $this->setRowTemplate('tpl.rbac_log_row.html', 'components/ILIAS/AccessControl');
         $this->setFilterCommand('applyLogFilter');
         $this->setResetCommand('resetLogFilter');
 

components/ILIAS/AccessControl/classes/class.ilRoleAdoptPermissionTableGUI.php

@@ -37,7 +37,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd)
         $this->setFormAction($this->ctrl->getFormAction($a_parent_obj));
         $this->setRowTemplate(
             "tpl.obj_role_adopt_permission_row.html",
-            "Services/AccessControl"
+            "components/ILIAS/AccessControl"
         );
         $this->addCommandButton("perm", $this->lng->txt("cancel"));
         $this->addMultiCommand("adoptPermSave", $this->lng->txt("save"));

components/ILIAS/AccessControl/classes/class.ilRoleSelectionTableGUI.php

@@ -38,7 +38,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd)
         $this->addColumn($this->lng->txt('context'), 'context', "30%");
 
         $this->setFormAction($this->ctrl->getFormAction($a_parent_obj));
-        $this->setRowTemplate("tpl.show_role_selection_row.html", "Services/AccessControl");
+        $this->setRowTemplate("tpl.show_role_selection_row.html", "components/ILIAS/AccessControl");
         $this->setDefaultOrderField('type');
         $this->setDefaultOrderDirection("desc");
     }

components/ILIAS/AccessControl/classes/class.ilRoleTableGUI.php

@@ -176,7 +176,7 @@ public function init(): void
                 break;
         }
 
-        $this->setRowTemplate('tpl.role_row.html', 'Services/AccessControl');
+        $this->setRowTemplate('tpl.role_row.html', 'components/ILIAS/AccessControl');
         $this->setFormAction($this->ctrl->getFormAction($this->getParentObject()));
         $this->setSelectAllCheckbox('roles');
 

components/ILIAS/AccessControl/test/ilServicesAccessControlSuite.php

@@ -26,7 +26,7 @@ public static function suite(): TestSuite
     {
         $suite = new ilServicesAccessControlSuite();
         /** @noRector */
-        include_once("./Services/AccessControl/test/ilRBACTest.php");
+        include_once("./components/ILIAS/AccessControl/test/ilRBACTest.php");
         $suite->addTestSuite(ilRBACTest::class);
         return $suite;
     }

components/ILIAS/Accessibility/classes/Document/class.ilAccessibilityDocumentTableGUI.php

@@ -61,7 +61,7 @@ public function __construct(
         $this->setExternalSegmentation(true);
         $this->setLimit(PHP_INT_MAX);
 
-        $this->setRowTemplate('tpl.acc_documents_row.html', 'Services/Accessibility');
+        $this->setRowTemplate('tpl.acc_documents_row.html', 'components/ILIAS/Accessibility');
 
         if ($this->isEditable) {
             $this->setSelectAllCheckbox('acc_id[]');

components/ILIAS/Accessibility/classes/class.ilAccessibilityControlConceptGUI.php

@@ -74,7 +74,7 @@ protected function initTemplate(string $a_tmpl): ilGlobalTemplate
     {
         $tpl = new ilGlobalTemplate("tpl.main.html", true, true);
         $template_file = $a_tmpl;
-        $template_dir = 'Services/Accessibility';
+        $template_dir = 'components/ILIAS/Accessibility';
         $tpl->addBlockFile('CONTENT', 'content', $template_file, $template_dir);
         return $tpl;
     }

components/ILIAS/Accessibility/test/ilServicesAccessibilitySuite.php

@@ -31,7 +31,7 @@ public static function suite()
     {
         $suite = new self();
 
-        require_once("./Services/Accessibility/test/AccessibilityCriterionConfigTest.php");
+        require_once("./components/ILIAS/Accessibility/test/AccessibilityCriterionConfigTest.php");
         $suite->addTestSuite("AccessibilityCriterionConfigTest");
 
         return $suite;

components/ILIAS/Accordion/classes/class.ilAccordionGUI.php

@@ -254,15 +254,15 @@ public static function addCss(): void
     public static function getLocalJavascriptFiles(): array
     {
         return array(
-            "./Services/Accordion/js/accordion.js",
+            "./components/ILIAS/Accordion/js/accordion.js",
             self::$owl_path . self::$owl_js_path
         );
     }
 
     public static function getLocalCssFiles(): array
     {
         return array(
-            "./Services/Accordion/css/accordion.css",
+            "./components/ILIAS/Accordion/css/accordion.css",
             self::$owl_path . self::$owl_css_path
         );
     }
@@ -309,7 +309,7 @@ public function getHTML(bool $async = false): string
         $this->addJavascript();
         $this->addCss();
 
-        $tpl = new ilTemplate("tpl.accordion.html", true, true, "Services/Accordion");
+        $tpl = new ilTemplate("tpl.accordion.html", true, true, "components/ILIAS/Accordion");
         foreach ($this->getItems() as $item) {
             $tpl->setCurrentBlock("item");
             $tpl->setVariable("HEADER", $item["header"]);

components/ILIAS/Accordion/test/ilServicesAccordionSuite.php

@@ -31,7 +31,7 @@ public static function suite(): self
     {
         $suite = new self();
 
-        require_once("./Services/Accordion/test/AccordionStandardGUIRequestTest.php");
+        require_once("./components/ILIAS/Accordion/test/AccordionStandardGUIRequestTest.php");
         $suite->addTestSuite("AccordionStandardGUIRequestTest");
 
         return $suite;

components/ILIAS/ActiveRecord/Fields/Converter/class.arConverter.php

@@ -69,7 +69,7 @@ public function readStructure(): void
     public function downloadClassFile(): void
     {
         $header = "<?php
-require_once('./Services/ActiveRecord/class.ActiveRecord.php');
+require_once('./components/ILIAS/ActiveRecord/class.ActiveRecord.php');
 
 /**
  * Class {CLASS_NAME}

components/ILIAS/ActiveRecord/Fields/Converter/templates/class.arTemplate.txt

@@ -1,6 +1,6 @@
 <!-- BEGIN class -->
 <?php
-require_once('./Services/ActiveRecord/class.ActiveRecord.php');
+require_once('./components/ILIAS/ActiveRecord/class.ActiveRecord.php');
 
 /**
  * Class {CLASS_NAME}

components/ILIAS/ActiveRecord/test/ilServicesActiveRecordSuite.php

@@ -29,10 +29,10 @@ public static function suite(): self
     {
         $self = new self();
         /** @noRector */
-        require_once("./Services/ActiveRecord/test/ilServicesActiveRecordConnectorTest.php");
+        require_once("./components/ILIAS/ActiveRecord/test/ilServicesActiveRecordConnectorTest.php");
         $self->addTestSuite("ilServicesActiveRecordConnectorTest");
         /** @noRector */
-        require_once("./Services/ActiveRecord/test/ilServicesActiveRecordFieldTest.php");
+        require_once("./components/ILIAS/ActiveRecord/test/ilServicesActiveRecordFieldTest.php");
         $self->addTestSuite("ilServicesActiveRecordFieldTest");
 
         return $self;

components/ILIAS/Administration/classes/class.ilAdministrationSettingsFormHandler.php

@@ -259,7 +259,7 @@ protected static function parseFieldDefinition(
                 $cmd = $fields[0];
                 $fields = $fields[1];
                 if (is_array($fields)) {
-                    $ftpl = new ilTemplate("tpl.external_settings.html", true, true, "Services/Administration");
+                    $ftpl = new ilTemplate("tpl.external_settings.html", true, true, "components/ILIAS/Administration");
 
 
                     $stack = array();

components/ILIAS/Administration/test/ilServicesAdministrationSuite.php

@@ -31,7 +31,7 @@ public static function suite(): self
     {
         $suite = new self();
 
-        require_once("./Services/Administration/test/AdminGUIRequestTest.php");
+        require_once("./components/ILIAS/Administration/test/AdminGUIRequestTest.php");
         $suite->addTestSuite("AdminGUIRequestTest");
 
         return $suite;

components/ILIAS/AdministrativeNotification/PRIVACY.md

@@ -5,7 +5,7 @@ Disclaimer: This documentation does not warrant completeness or correctness. Ple
 - User IDs of the persons that created and last updated the AdministrativeNotification entry as well as the timestamps of the creation and last update of the entry are stored. This data is stored in order to ensure internal traceability regarding timing and authorship in the event of any problems caused by the AdministrativeNotification entry.
 - User IDs of the persons that dismissed the notification are stored. This prevents the AdministrativeNotification service from showing dismissed notifications again.
 - The AdministrativeNotification service employs the following services, please consult the respective privacy.mds:
-  - [GlobalScreen](../../Services/GlobalScreen/PRIVACY.md)
+  - [GlobalScreen](../../components/ILIAS/GlobalScreen_/PRIVACY.md)
 
 ## Data being presented
 - The AdministrativeNotification service does not present any personal data.

components/ILIAS/AdministrativeNotification/classes/class.ilADNNotificationTableGUI.php

@@ -54,7 +54,7 @@ public function __construct(ilADNNotificationGUI $a_parent_obj, string $a_parent
         $this->access = new ilObjAdministrativeNotificationAccess();
 
         $this->setId('msg_msg_table');
-        $this->setRowTemplate('Services/AdministrativeNotification/templates/default/tpl.row.html');
+        $this->setRowTemplate('components/ILIAS/AdministrativeNotification/templates/default/tpl.row.html');
         parent::__construct($a_parent_obj, $a_parent_cmd);
         $this->setFormAction($this->ctrl->getFormAction($a_parent_obj));
         //

components/ILIAS/AdministrativeNotification/test/ilServicesAdministrativeNotificationSuite.php

@@ -28,7 +28,7 @@ public static function suite(): self
     {
         $suite = new self();
 
-        require_once("./Services/AdministrativeNotification/test/ilServicesAdministrativeNotificationTest.php");
+        require_once("./components/ILIAS/AdministrativeNotification/test/ilServicesAdministrativeNotificationTest.php");
         $suite->addTestSuite("ilServicesAdministrativeNotificationTest");
 
         return $suite;

components/ILIAS/AdvancedEditing/test/ilServicesAdvancedEditingSuite.php

@@ -28,7 +28,7 @@ public static function suite(): self
     {
         $suite = new self();
 
-        require_once("./Services/AdvancedEditing/test/AdveStandardGUIRequestTest.php");
+        require_once("./components/ILIAS/AdvancedEditing/test/AdveStandardGUIRequestTest.php");
         $suite->addTestSuite("AdveStandardGUIRequestTest");
 
         return $suite;

components/ILIAS/AdvancedMetaData/classes/Record/class.ilAdvancedMDRecordExportFilesTableGUI.php

@@ -39,7 +39,7 @@ public function __construct($a_parent_obj, $a_parent_cmd = '')
         $this->addColumn($this->lng->txt('filesize'), 'file_size', "33%");
 
         $this->setFormAction($this->ctrl->getFormAction($a_parent_obj));
-        $this->setRowTemplate("tpl.edit_files_row.html", "Services/AdvancedMetaData");
+        $this->setRowTemplate("tpl.edit_files_row.html", "components/ILIAS/AdvancedMetaData");
         $this->setDefaultOrderField("date");
         $this->setDefaultOrderDirection('desc');
     }

components/ILIAS/AdvancedMetaData/classes/Record/class.ilAdvancedMDRecordTableGUI.php

@@ -51,7 +51,7 @@ public function __construct(
         $this->addColumn($this->lng->txt('actions'));
 
         $this->setFormAction($this->ctrl->getFormAction($a_parent_obj));
-        $this->setRowTemplate("tpl.show_records_row.html", "Services/AdvancedMetaData");
+        $this->setRowTemplate("tpl.show_records_row.html", "components/ILIAS/AdvancedMetaData");
         $this->setDefaultOrderField('position');
         $this->setDefaultOrderDirection('asc');
         $this->setShowRowsSelector(true);