@sapui5/sap.ushell_abap 1.109.2 → 1.111.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell_abap",
-    "version": "1.109.2",
+    "version": "1.111.0",
     "description": "SAPUI5 Library sap.ushell_abap",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [

package/src/main/js/sap/ushell_abap/.library

@@ -2,7 +2,7 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell_abap</name>
     <vendor>SAP SE</vendor>
-    <version>1.109.2</version>
+    <version>1.111.0</version>
     <copyright>Copyright (c) 2009-2022 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell_abap</documentation>
 

package/src/main/js/sap/ushell_abap/adapters/abap/AdapterContainer.js

@@ -5,13 +5,15 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ui/thirdparty/jquery",
     "sap/ui/core/format/DateFormat",
-    "sap/ushell_abap/pbServices/ui2/ODataService"
+    "sap/ushell_abap/pbServices/ui2/ODataService",
+    "sap/ushell/services/_Personalization/constants"
 ], function (
     ObjectPath,
     Log,
     jQuery,
     DateFormat,
-    ODataService
+    ODataService,
+    constants
 ) {
     "use strict";
 
@@ -40,11 +42,8 @@ sap.ui.define([
         this._sContainerKey = rectifyKey(sContainerKey);
         this._sAppName = sAppName || "";
 
-        var PersonalizationAdapter = sap.ui.require("sap/ushell_abap/adapters/abap/PersonalizationAdapter");
-        if (PersonalizationAdapter) {
-            // Determine category resulting out of possible scope flag combinations
-            this._category = PersonalizationAdapter.prototype._determineCategory(oScope);
-        }
+        // Determine category resulting out of possible scope flag combinations
+        this._category = this._determineCategory(oScope);
 
         this._oJSONContainer = {
             "category": this._category,
@@ -103,6 +102,7 @@ sap.ui.define([
     };
 
     AdapterContainer.prototype.save = function () {
+        Log.debug("[000] save", "AdapterContainer");
         var oDeferred = new jQuery.Deferred(),
             that = this,
             oDataWrapper = this._obtainODataWrapper(),
@@ -349,5 +349,27 @@ sap.ui.define([
         // TODO throw?
     };
 
+    /**
+     * Determine the correct category resulting out of possible scope flag combinations
+     *
+     * @param {object} oScope Scope object
+     *
+     * @returns {string} category information
+     *
+     * @private
+     */
+    AdapterContainer.prototype._determineCategory = function (oScope) {
+        if (!oScope) {
+            return "U";
+        }
+        var oConstants = constants;
+        if (oScope.keyCategory && oScope.keyCategory === oConstants.keyCategory.FIXED_KEY &&
+                oScope.writeFrequency && oScope.writeFrequency === oConstants.writeFrequency.LOW &&
+                    oScope.clientStorageAllowed && oScope.clientStorageAllowed === true) {
+            return "P";
+        }
+        return "U";
+    };
+
     return AdapterContainer;
 }, true /* bExport */);

package/src/main/js/sap/ushell_abap/adapters/abap/AppStateAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's AppStateAdapter for the ABAP platform.
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell_abap/adapters/abap/ClientSideTargetResolutionAdapter.js

@@ -9,7 +9,7 @@
  *     <li>provide the resolveHashFragmentFallback function, a fallback method called by ClientSideTargetResolution service.</li>
  *   </ul>
  *
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
@@ -20,7 +20,8 @@ sap.ui.define([
     "sap/ushell/utils/UrlParsing",
     "sap/base/Log",
     "sap/ushell_abap/pbServices/ui2/ODataWrapper",
-    "sap/ushell_abap/pbServices/ui2/Utils"
+    "sap/ushell_abap/pbServices/ui2/Utils",
+    "sap/ui/thirdparty/URI"
 ], function (
     jQuery,
     ObjectPath,
@@ -30,7 +31,8 @@ sap.ui.define([
     urlParsing,
     Log,
     ODataWrapper,
-    Utils
+    Utils,
+    URI
 ) {
     "use strict";
 
@@ -306,7 +308,6 @@ sap.ui.define([
                                 oAdjustedResult.additionalInformation = "SAPUI5.Component=" + oAdjustedResult.ui5ComponentName;
                             }
                             if (oSelf && oSelf.url && typeof oSelf.url === "string") {
-                                var URI = sap.ui.require("sap/ui/thirdparty/URI");
                                 oUri = sUrl && new URI(sUrl);
 
                                 if (oUri) {

package/src/main/js/sap/ushell_abap/adapters/abap/ConfigurationDefaultsAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The ConfigurationDefaults adapter for the ABAP platform.
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([
     "sap/ushell_abap/bootstrap/evo/abap.constants",

package/src/main/js/sap/ushell_abap/adapters/abap/ContainerAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's container adapter for the ABAP platform.
  *
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell_abap/adapters/abap/LaunchPageAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
  *
  * @deprecated since 1.100
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI",
@@ -22,7 +22,8 @@ sap.ui.define([
     "sap/base/Log",
     "sap/m/library",
     "sap/ushell/ui/tile/StaticTile",
-    "sap/ushell/utils"
+    "sap/ushell/utils",
+    "sap/ushell_abap/pbServices/ui2/contracts/preview"
 ], function (
     URI,
     ManifestPropertyHelper,
@@ -39,7 +40,8 @@ sap.ui.define([
     Log,
     mobileLibrary,
     StaticTile,
-    ushellUtils
+    ushellUtils,
+    Preview
 ) {
     "use strict";
 
@@ -95,9 +97,7 @@ sap.ui.define([
         this._bPageSetFullyLoaded = false;
         this._aOtherChipsPromises = [];
 
-        if (sap.ui2.srvc.contracts.preview.setEnvironmentType) {
-            sap.ui2.srvc.contracts.preview.setEnvironmentType("runtime");
-        }
+        Preview.setEnvironmentType("runtime");
 
         /**
          * Robust call to <code>sap.ushell_abap.pbServices.ui2.ChipInstance#getImplementationAsSapui5()</code>.

package/src/main/js/sap/ushell_abap/adapters/abap/NavTargetResolutionAdapter.js

@@ -8,7 +8,7 @@
  * service now calls the ClientSideTargetResolution service in the abap
  * platform.
  *
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell_abap/adapters/abap/PageBuildingAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell_abap/adapters/abap/PagePersistenceAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview PagePersistenceAdapter for the ABAP platform.
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell_abap/adapters/abap/PersonalizationAdapter.js

@@ -7,22 +7,22 @@
  *               Container header properties transported via pseudo-items are mapped to the
  *               respective header properties in setItem/getItem/delItem
  *
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([
     "sap/ushell_abap/adapters/abap/AdapterContainer",
-    "sap/ushell/services/_Personalization/constants",
     "sap/ushell_abap/pbServices/ui2/ODataWrapper",
     "sap/ushell_abap/pbServices/ui2/ODataService",
     "sap/ushell_abap/pbServices/ui2/Error",
-    "sap/base/util/ObjectPath"
+    "sap/base/util/ObjectPath",
+    "sap/base/Log"
 ], function (
     AdapterContainer,
-    constants,
     ODataWrapper,
     ODataService,
     SrvcError,
-    ObjectPath
+    ObjectPath,
+    Log
 ) {
     "use strict";
 
@@ -43,6 +43,7 @@ sap.ui.define([
      * @private
      */
     var PersonalizationAdapter = function (oSystem, sParameters, oConfig) {
+        Log.debug("[000] PersonalizationAdapter: constructor", "PersonalizationAdapter");
         this._oConfig = oConfig && oConfig.config;
         var sPersonalizationServiceURL = (ObjectPath.get("config.services.personalization.baseUrl", oConfig) || "/sap/opu/odata/UI2/INTEROP") + "/";
         var oODataWrapperSettings = {
@@ -71,28 +72,6 @@ sap.ui.define([
         return this.getAdapterContainer(sContainerKey, oScope).del();
     };
 
-    /**
-     * Determine the correct category resulting out of possible scope flag combinations
-     *
-     * @param {object} oScope Scope object
-     *
-     * @returns {string} category information
-     *
-     * @private
-     */
-    PersonalizationAdapter.prototype._determineCategory = function (oScope) {
-        if (!oScope) {
-            return "U";
-        }
-        var oConstants = constants;
-        if (oScope.keyCategory && oScope.keyCategory === oConstants.keyCategory.FIXED_KEY &&
-                oScope.writeFrequency && oScope.writeFrequency === oConstants.writeFrequency.LOW &&
-                    oScope.clientStorageAllowed && oScope.clientStorageAllowed === true) {
-            return "P";
-        }
-        return "U";
-    };
-
     return PersonalizationAdapter;
 
 }, true /* bExport */);

package/src/main/js/sap/ushell_abap/adapters/abap/SearchAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Search adapter for the ABAP platform.
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell_abap/adapters/abap/SupportTicketAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The SupportTicket adapter for the ABAP platform.
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([
     "sap/base/util/isEmptyObject",

package/src/main/js/sap/ushell_abap/adapters/abap/Ui5ComponentLoaderAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the ABAP platform
  *
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell_abap/adapters/abap/UserInfoAdapter.js

@@ -201,6 +201,7 @@ sap.ui.define([
          *  jQuery.promise object
          */
         this.updateUserPreferences = function (oUser) {
+            Log.debug("[000] updateUserPreferences", "UserInfoAdapter");
             var that = this,
                 oDeferred,
                 sRelativeUrl,
@@ -216,15 +217,17 @@ sap.ui.define([
                 fnFailure = function (sErrorMessage, oParsedErrorInformation) {
                     oDeferred.reject(sErrorMessage, oParsedErrorInformation);
                 };
-
+            Log.debug("[000] updateUserPreferences: _createWrapper", "UserInfoAdapter");
             oDataWrapper = this._createWrapper("/sap/opu/odata/UI2/INTEROP/");
             oDeferred = new jQuery.Deferred();
 
             // prepare
+            Log.debug("[000] updateUserPreferences: oDataWrapper.openBatchQueue", "UserInfoAdapter");
             oDataWrapper.openBatchQueue();
 
             // put the preferences to update in the OData batch queue
             aUserChangedProperties = oUser.getChangedProperties() || [];
+            Log.debug("[000] updateUserPreferences: getChangedProperties", "UserInfoAdapter");
             iODataRequestsRunning = aUserChangedProperties.length;
             aUserChangedProperties.forEach(function (oUserChangedProperty) {
                 var name = oUserChangedProperty.name,
@@ -246,9 +249,10 @@ sap.ui.define([
                 };
                 //check for the datatype of the value & process oDataObj
                 that._updateODataObjectBasedOnDatatype(newValue, oDataObj);
+                Log.debug("[000] updateUserPreferences: oDataWrapper: put", "UserInfoAdapter");
                 oDataWrapper.put(sRelativeUrl, oDataObj, fnSuccess, fnFailure);
             });
-
+            Log.debug("[000] updateUserPreferences: submitBatchQueue", "UserInfoAdapter");
             // submit
             oDataWrapper.submitBatchQueue(function () {
                 // request accepted but does not mean that the single requests

package/src/main/js/sap/ushell_abap/adapters/hana/ContainerAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's container adapter for the HANA platform.
  *
- * @version 1.109.2
+ * @version 1.111.0
  */
 /**
  * @namespace Default namespace for Unified Shell adapters for the HANA platform. They can usually

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap-def-dev.js

@@ -13,14 +13,14 @@ sap.ui.define([
     oBoottask,
     fnConfigureUi5,
     fnExtractUi5LibsFromUshellConfig,
-    bDebugSources,
+    oDebugMode,
     fnLoadBootstrapExtension
 ) {
     "use strict";
 
     var oUShellConfig;
 
-    window["sap-ui-debug"] = bDebugSources; //use in LaunchPageAdapter
+    window["sap-ui-debug"] = oDebugMode.isDebug(); //use in LaunchPageAdapter
     oUShellConfig = fnConfigureUshell();
     fnConfigureUi5({
         ushellConfig: oUShellConfig,

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap-def.js

@@ -15,14 +15,14 @@ sap.ui.define([
     fnConfigureUi5,
     fnExtractUi5LibsFromUshellConfig,
     fnLoadBootstrapExtension,
-    bDebugSources,
-    fnLoadCoreMin
+    oDebugMode,
+    oCoreMinLoader
 ) {
     "use strict";
 
     var oUShellConfig;
 
-    window["sap-ui-debug"] = bDebugSources; //use in LaunchPageAdapter
+    window["sap-ui-debug"] = oDebugMode.isDebug(); //use in LaunchPageAdapter
     oUShellConfig = fnConfigureUshell();
     fnConfigureUi5({
         ushellConfig: oUShellConfig,
@@ -37,6 +37,6 @@ sap.ui.define([
         onInitCallback: fnLoadLaunchpad
     });
 
-    fnLoadCoreMin.load("sap.ushell_abap.bootstrap.evo");
+    oCoreMinLoader.load(oUShellConfig.ushell.customPreload);
     fnLoadBootstrapExtension(oUShellConfig);
 });

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.configure.ushell.js

@@ -14,7 +14,7 @@
  * It furthermore calculates if FLP pages get activated and if needed sets up
  * the configuration environment to run these.
  *
- * @version 1.109.2
+ * @version 1.111.0
  */
 sap.ui.define([
     "./abap.constants",

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.constants.js

@@ -18,6 +18,21 @@ sap.ui.define([
                     myHome: {
                         enabled: true
                     }
+                },
+                customPreload: {
+                    enabled: true,
+                    coreResources: [
+                        "sap/ushell_abap/bootstrap/evo/core-min-0.js",
+                        "sap/ushell_abap/bootstrap/evo/core-min-1.js",
+                        "sap/ushell_abap/bootstrap/evo/core-min-2.js",
+                        "sap/ushell_abap/bootstrap/evo/core-min-3.js"
+                    ],
+                    coreResourcesComplement: [
+                        "sap/ushell_abap/bootstrap/evo/core-ext-light-0.js",
+                        "sap/ushell_abap/bootstrap/evo/core-ext-light-1.js",
+                        "sap/ushell_abap/bootstrap/evo/core-ext-light-2.js",
+                        "sap/ushell_abap/bootstrap/evo/core-ext-light-3.js"
+                    ]
                 }
             },
             renderers: {
@@ -76,11 +91,6 @@ sap.ui.define([
                         enableClientSideTargetResolution: true
                     }
                 },
-                Ui5ComponentLoader: {
-                    config: {
-                        amendedLoading: true
-                    }
-                },
                 ShellNavigation: {
                     config: {
                         reload: false
@@ -127,23 +137,6 @@ sap.ui.define([
                     }
                 }
             },
-            // platform specific (ABAP) launchpad configuration
-            launchpadConfiguration: {
-                configurationFile: {
-                    configurationFileFolderWhitelist: { // inclusive language FLPCOREANDUX-4020: this configuration parameter is deprecated and will be removed
-                        "": true,
-                        "cfg/": true,
-                        "cfg/sap/": true,
-                        "/sap/bc/ui5_ui5/ui2/ushell/shells/abap/": true,
-                        "/sap/bc/ui5_ui5/ui2/ushell/shells/abap/cfg/": true,
-                        "/sap/bc/ui5_ui5/ui2/ushell/shells/abap/cfg/sap/": true,
-                        "/sap/ushell_config/": true,
-                        "/sap/bc/ui5_demokit/test-resources/sap/ushell/demoapps/LaunchpadConfigFileExamples/": true,
-                        "/resources/sap/dfa/help/sap/cfg/": true,
-                        "/sap/bc/ui5_ui5/ui2/ushell_me/sap/ushell/me/": true
-                    }
-                }
-            },
             xhrLogon: {
                 // Configuration for XHR-Logon mode. See SAP Note 2193513 for details.
                 mode: "frame"

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.load.launchpad.js

@@ -1,9 +1,6 @@
 // Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 sap.ui.define([
-    "sap/base/util/UriParameters",
-    "sap/base/Log",
     "./boottask",
-    "sap/ui/core/Configuration",
     "sap/ushell_abap/pbServices/ui2/contracts/bag",
     "sap/ushell_abap/pbServices/ui2/contracts/configuration",
     "sap/ushell_abap/pbServices/ui2/contracts/configurationUi",
@@ -16,10 +13,7 @@ sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/contracts/actions",
     "sap/ushell_abap/pbServices/ui2/contracts/types"
 ], function (
-    UriParameters,
-    Log,
-    Boottask,
-    Configuration
+    Boottask
     /*
     ui2ContractsBag,
     ui2Configuration,
@@ -36,34 +30,6 @@ sap.ui.define([
 ) {
     "use strict";
     return function () {
-        // check if framing control of ui5 should be active (meta tag set)
-        var oFramingControl = window["sap-ushell-framing-control"];
-        var oUriParameters = UriParameters.fromQuery(window.location.search);
-        var terminationKey = oUriParameters.get("SAPSessionCmd") || oUriParameters.get("sap-sessioncmd");
-
-        if (oFramingControl && oFramingControl.verifyUi5ProtectionActive) {
-            var sUi5FrameOptions = (typeof Configuration.getFrameOptions === "function") && Configuration.getFrameOptions();
-            if (sUi5FrameOptions === "trusted" || sUi5FrameOptions === "deny") {
-                // ui5 protection active, so we can unlock
-                oFramingControl.unlock();
-                Log.debug("UI5 framing protection active, unlocking FLP protection");
-            } else {
-                // ui5 protection not active although meta tag set; this is an illegal state that can only
-                // happen if UI2 version is newer than UI5, but UI5 ABAP code is already active
-                throw new Error("UI5 framing protection is NOT active, although sap.allowlistService meta tag set."
-                    + " Ensure consistent deployment of UI5 and UI2 resources.");
-            }
-        }
-
-        // check if this is a DSM terminate session (which comes from EP)
-        if (terminationKey === "USR_LOGOFF") {
-            // DSM notification for user log off - call the Container logoff API
-            sap.ushell.Container.logout();
-            return;
-        } else if (terminationKey === "USR_ABORT") {
-            // DSM notification for user aborted
-            return;
-        }
         sap.ui.require(["sap/ushell/iconfonts"], function (IconFonts) {
             window.sap.ushell.Container.createRenderer("fiori2", true).then(
                 function (oContent) {

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.xhrlogon.configure.js

@@ -0,0 +1,84 @@
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+sap.ui.define([
+    "sap/ushell/bootstrap/common/common.util",
+    "sap/base/Log"
+], function (oUtils, Log) {
+    "use strict";
+
+    var oModule = {
+        start: start,
+        initXhrLogonIgnoreList: initXhrLogonIgnoreList,
+        createUi5ConnectedXhrLogger: createUi5ConnectedXhrLogger
+    };
+    return oModule;
+
+    /**
+     * Creates a logger for XMLHttpRequest(s) that logs errors, warnings, info
+     * and debug messages via Log.
+     *
+     * @return {object}
+     *    A logger that can be assigned to XMLHttpRequest.
+     *
+     * @private
+     */
+    function createUi5ConnectedXhrLogger () {
+        return ["error", "warning", "info", "debug"].reduce(function (oXhrLogger, sLevel) {
+            oXhrLogger[sLevel] = function (sMsg) {
+                return Log[sLevel](sMsg);
+            };
+            return oXhrLogger;
+        }, {});
+    }
+
+    /**
+     * Initializes the ignore list of the XHR logon manager.
+     * <p>
+     * If the UI5 resources (including the own bootstrap script) are loaded from an absolute URL
+     * (in case CDN is activated),
+     * this URL is added to the ignore list to prevent CORS preflight requests due to the X headers.
+     * We expect that all resources can be loaded without authentication in this case.
+     *
+     * @param {object} oXHRLogonManager
+     *     the logon frame manager instance to use
+     *
+     * @private
+     */
+    function initXhrLogonIgnoreList (oXHRLogonManager) {
+        var sOrigin = oUtils.getLocationOrigin(),
+        sUi5ResourceRootUrl = sap.ui.require.toUrl("");
+
+        // add "/" to origin, as otherwise the following use case will match:
+        //      sUi5ResourceRootUrl: http://sap.com:123
+        //      sOrigin:             http://sap.com
+        if (sUi5ResourceRootUrl && sUi5ResourceRootUrl.indexOf(sOrigin + "/") === -1) {
+            // In case UI5 is loaded from a different domain (CDN / AKAMAI), that URL
+            // needs to be ignored for the XHR logon, as we expect that the resources
+            // are not protected.
+            oXHRLogonManager.ignore.add(sUi5ResourceRootUrl);
+        }
+    }
+
+    /**
+     * Enables the handling of the XHR Logon in the FLP.
+     * Note: using sap.ui.require.toUrl for initXhrLogonIgnoreList as it
+     * will be loaded in CDM (compare to ABAP, where this is not the case)
+     *
+     * @param {object} oSapUshellContainer
+     *    The active <code>sap.ushell.Container</code> instance to configure
+     *    the logon manager into.
+     *
+     * @param {object} oXhrLogonLib XHR logon lib.
+     *
+     * @private
+     */
+    function start (oSapUshellContainer, oXhrLogonLib) {
+        oXhrLogonLib.start();
+
+        oModule.initXhrLogonIgnoreList(oXhrLogonLib.XHRLogonManager.getInstance());
+
+        // configure logger
+        XMLHttpRequest.logger = createUi5ConnectedXhrLogger();
+
+        oSapUshellContainer.oFrameLogonManager = oXhrLogonLib.FrameLogonManager.getInstance();
+    }
+});

package/src/main/js/sap/ushell_abap/bootstrap/evo/{abap.xhr.handler.js → abap.xhrlogon.handler.js}

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 sap.ui.define([
-    "sap/ushell/bootstrap/common/common.load.xhrlogon",
-    "sap/ushell/bootstrap/common/common.configure.xhrlogon",
+    "./abap.xhrlogon.load",
+    "./abap.xhrlogon.configure",
     "./abap.bootstrap.utils",
     "./XhrLogonEventHandler",
     "sap/base/Log"
@@ -53,7 +53,7 @@ sap.ui.define([
             });
         } else if (sLogonMode !== "frame") {
             Log.warning("Unknown setting for xhrLogonMode: '" + sLogonMode + "'. Using default mode 'frame'.",
-            null, "sap.ushell_abap.bootstrap.evo.abap.xhr.handler");
+            null, "sap.ushell_abap.bootstrap.evo.abap.xhrlogon.handler");
         }
 
         XMLHttpRequest.logger = oConfigureXhrLogon.createUi5ConnectedXhrLogger();