@sapui5/sap.ushell_abap 1.94.0 → 1.96.1

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.94.0
+ * @version 1.96.1
  */
 sap.ui.define([], function () {
     "use strict";

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

@@ -2,18 +2,20 @@
 
 /**
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
- * @version 1.94.0
+ * @version 1.96.1
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
-    "sap/ui2/srvc/factory",
-    "sap/ui2/srvc/PageBuildingService",
-    "sap/ui2/srvc/RemoteCatalogService",
-    "sap/ui2/srvc/pageset",
+    "sap/base/Log",
+    "sap/ushell_abap/pbServices/ui2/Factory",
+    "sap/ushell_abap/pbServices/ui2/PageBuildingService",
+    "sap/ushell_abap/pbServices/ui2/RemoteCatalogService",
+    "sap/ushell_abap/pbServices/ui2/PageSet",
     "sap/ushell/System"
 ], function (
-    ObjectPath
-    // factory
+    ObjectPath,
+    Log,
+    Factory
     // PageBuildingService
     // RemoteCatalogService
     // pageset
@@ -29,7 +31,7 @@ sap.ui.define([
      * contain a map of remote catalog base URLs to corresponding remote catalog services.
      * Each such service is assumed to be a no-args constructor function.
      * First the module is required and then the constructor is called, passing the result to
-     * {@link sap.ui2.srvc.Factory#addRemoteCatalogService}.
+     * {@link sap.ushell_abap.pbServices.ui2.Factory#addRemoteCatalogService}.
      * <p>
      * <b>Example:</b>
      *   <pre>
@@ -38,7 +40,7 @@ sap.ui.define([
      *       adapter: {
      *         config: {
      *           remoteCatalogServices: {
-     *             "/sap/opu/odata/UI2/PAGE_BUILDER_PERS/": "sap.ui2.srvc.RemoteCatalogService",
+     *             "/sap/opu/odata/UI2/PAGE_BUILDER_PERS/": "sap.ushell_abap.pbServices.ui2.RemoteCatalogService",
      *             "/foo": "acme.BarService"
      *           }
      *         }
@@ -47,10 +49,10 @@ sap.ui.define([
      *   }
      *   </pre>
      * With the given configuration the adapter registers remote catalog services for two base URLs
-     * using <code>sap.ui2.srvc.RemoteCatalogService</code> and <code>acme.BarService</code> resp.
+     * using <code>sap.ushell_abap.pbServices.ui2.RemoteCatalogService</code> and <code>acme.BarService</code> resp.
      * as remote catalog service constructor functions.
      * <p>
-     * If not specified otherwise, <code>sap.ui2.srvc.RemoteCatalogService</code> is registered as
+     * If not specified otherwise, <code>sap.ushell_abap.pbServices.ui2.RemoteCatalogService</code> is registered as
      * a remote catalog service for the following base URLs:
      * <ul>
      *   <li> "/sap/hba/apps/kpi/s/odata/hana_chip_catalog.xsodata/" (legacy HANA catalogs)</li>
@@ -79,7 +81,7 @@ sap.ui.define([
 
         /**
          * Returns the UI2 page building factory.
-         * @returns {sap.ui2.srvc.Factory} the page building factory
+         * @returns {sap.ushell_abap.pbServices.ui2.Factory} the page building factory
          */
         this.getFactory = function () {
             return oFactory;
@@ -101,7 +103,7 @@ sap.ui.define([
             sPageBuilderServiceUrl = sConfigBaseUrl;
         }
 
-        oFactory = sap.ui2.srvc.createFactory(
+        oFactory = Factory.createFactory(
             sPageBuilderServiceUrl,
             undefined,
             sScope === "PERS"
@@ -113,12 +115,20 @@ sap.ui.define([
             "/sap/opu/odata/sap/SM_CATALOG_SRV/"
         ].forEach(function (sBaseUrl) {
             if (!Object.prototype.hasOwnProperty.call(mRemoteCatalogServices, sBaseUrl)) {
-                mRemoteCatalogServices[sBaseUrl] = "sap.ui2.srvc.RemoteCatalogService";
+                mRemoteCatalogServices[sBaseUrl] = "sap.ushell_abap.pbServices.ui2.RemoteCatalogService";
             }
         });
         Object.keys(mRemoteCatalogServices).forEach(function (sBaseUrl) {
             var sRemoteCatalogService = mRemoteCatalogServices[sBaseUrl];
-            jQuery.sap.require(sRemoteCatalogService); // TODO: remove jQuery.sap
+            // Convert to new "home" of RemoteCatalogService
+            if (sRemoteCatalogService === "sap.ui2.srvc.RemoteCatalogService") {
+                sRemoteCatalogService = "sap.ushell_abap.pbServices.ui2.RemoteCatalogService";
+            }
+            var sModulePath = (sRemoteCatalogService || "").replace(/\./g, "/");
+            if (!sap.ui.require(sModulePath)) {
+                Log.error("FLP PageBuildingAdapter: remote catalog service " + sModulePath + " must be loaded before use.");
+                sap.ui.requireSync(sModulePath);
+            }
             oFactory.addRemoteCatalogService(sBaseUrl,
                 new (ObjectPath.get(sRemoteCatalogService))());
         });

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview PagePersistenceAdapter for the ABAP platform.
- * @version 1.94.0
+ * @version 1.96.1
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
@@ -2636,6 +2636,7 @@ sap.ui.define([
                     subTitle: oViz.subTitle,
                     icon: oViz.iconUrl,
                     info: chipsUtils.getInfoFromSimplifiedChip(oSimplifiedChip),
+                    keywords: chipsUtils.getKeywordsFromSimplifiedChip(oSimplifiedChip),
                     size: chipsUtils.getTileSizeFromSimplifiedChip(oSimplifiedChip),
                     indicatorDataSource: chipsUtils.getIndicatorDataSourceFromSimplifiedChip(oSimplifiedChip),
                     url: chipsUtils.getTargetUrlFromSimplifiedChip(oSimplifiedChip, URLParsing),
@@ -2678,7 +2679,7 @@ sap.ui.define([
      *
      * @param {object} oVisualization The visualization to create the chip from
      * @returns {object}
-     *  A simplified version of the sap.ui2.srvc.ChipInstance.
+     *  A simplified version of the sap.ushell_abap.pbServices.ui2.ChipInstance.
      *  The object structure of the simplified chip model can be viewed in the "simplifiedChipModel.md" document in the FLP core-concepts GitHub repository.
      *
      * @since 1.90.0

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

@@ -7,16 +7,25 @@
  *               Container header properties transported via pseudo-items are mapped to the
  *               respective header properties in setItem/getItem/delItem
  *
- * @version 1.94.0
+ * @version 1.96.1
  */
 sap.ui.define([
     "sap/ushell_abap/adapters/abap/AdapterContainer",
     "sap/ushell/services/Personalization",
     "sap/ushell/services/_Personalization/constants",
-    "sap/ui2/srvc/ODataWrapper",
-    "sap/ui2/srvc/ODataService",
+    "sap/ushell_abap/pbServices/ui2/ODataWrapper",
+    "sap/ushell_abap/pbServices/ui2/ODataService",
+    "sap/ushell_abap/pbServices/ui2/Error",
     "sap/base/util/ObjectPath"
-], function (AdapterContainer, Personalization, constants, ODataWrapper, ODataService, ObjectPath) {
+], function (
+    AdapterContainer,
+    Personalization,
+    constants,
+    ODataWrapper,
+    ODataService,
+    SrvcError,
+    ObjectPath
+) {
     "use strict";
 
     // --- Adapter ---
@@ -43,11 +52,11 @@ sap.ui.define([
             "sap-language": sap.ushell.Container.getUser().getLanguage(),
             "sap-client": sap.ushell.Container.getLogonSystem().getClient()
         };
-        this._oWrapper = sap.ui2.srvc.createODataWrapper(oODataWrapperSettings);
+        this._oWrapper = ODataWrapper.createODataWrapper(oODataWrapperSettings);
         function fnDefaultFailure (oMessage) {
-            sap.ui2.srvc.Error(oMessage, "sap.ushell_abap.adapters.abap.PersonalizationAdapter");
+            throw new SrvcError(oMessage, "sap.ushell_abap.adapters.abap.PersonalizationAdapter");
         }
-        sap.ui2.srvc.ODataService.call(this, this._oWrapper, fnDefaultFailure);
+        ODataService.call(this, this._oWrapper, fnDefaultFailure);
     };
 
     // historically, the service always called  getAdapterContainer and then load

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.94.0
+ * @version 1.96.1
  */
 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.94.0
+ * @version 1.96.1
  */
 sap.ui.define([
     "sap/base/util/isEmptyObject",
@@ -10,16 +10,16 @@ sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ushell/utils",
     "sap/ushell/resources",
-    "sap/ui2/srvc/ODataWrapper",
-    "sap/ui2/srvc/ODataService"
+    "sap/ushell_abap/pbServices/ui2/ODataWrapper",
+    "sap/ushell_abap/pbServices/ui2/ODataService"
 ], function (
     isEmptyObject,
     ObjectPath,
     jQuery,
     utils,
-    resources
-    // ODataWrapper
-    // ODataService
+    resources,
+    ODataWrapper,
+    ODataService
 ) {
     "use strict";
 
@@ -92,8 +92,8 @@ sap.ui.define([
                 "sap-language": oContainer.getUser().getLanguage(),
                 "sap-client": oContainer.getLogonSystem().getClient()
             };
-            oDataWrapper = new sap.ui2.srvc.createODataWrapper(oODataWrapperSettings);
-            sap.ui2.srvc.ODataService.call(this, oDataWrapper, function () {
+            oDataWrapper = new ODataWrapper.createODataWrapper(oODataWrapperSettings);
+            ODataService.call(this, oDataWrapper, function () {
                 return false;
             });
 

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.94.0
+ * @version 1.96.1
  */
 sap.ui.define([
 ], function () {

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

@@ -1,13 +1,20 @@
 // Copyright (c) 2009-2021 SAP SE. All rights reserved.
 
 sap.ui.define([
-    "sap/ui2/srvc/ODataWrapper",
-    "sap/ui2/srvc/ODataService",
+    "sap/ushell_abap/pbServices/ui2/ODataWrapper",
+    "sap/ushell_abap/pbServices/ui2/ODataService",
     "sap/ui/thirdparty/datajs",
     "sap/ui/thirdparty/jquery",
     "sap/base/Log",
     "sap/ushell/resources"
-], function (ODataWrapper, ODataService, OData, jQuery, Log, resources) {
+], function (
+    ODataWrapper,
+    ODataService,
+    OData,
+    jQuery,
+    Log,
+    resources
+) {
     "use strict";
 
     /**
@@ -182,7 +189,7 @@ sap.ui.define([
         };
 
         this._createWrapper = function (sBaseUrl) {
-            return sap.ui2.srvc.createODataWrapper(sBaseUrl, false, function (sError) { /*default error handler*/ });
+            return ODataWrapper.createODataWrapper(sBaseUrl, false, function (sError) { /*default error handler*/ });
         };
 
         /**

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.94.0
+ * @version 1.96.1
  */
 /**
  * @namespace Default namespace for Unified Shell adapters for the HANA platform. They can usually
@@ -16,12 +16,18 @@
  * @private
  */
 sap.ui.define([
-    "sap/ui2/srvc/utils",
+    "sap/ushell_abap/pbServices/ui2/Utils",
     "sap/ushell/System",
     "sap/ushell/User",
     "sap/ui/thirdparty/jquery",
     "sap/base/Log"
-], function (utils, System, User, jQuery, Log) {
+], function (
+    Utils,
+    System,
+    User,
+    jQuery,
+    Log
+) {
     "use strict";
 
     /**

package/src/main/js/sap/ushell_abap/bootstrap/evo/XhrLogonEventHandler.js

@@ -2,8 +2,13 @@
 
 sap.ui.define([
     "./abap.bootstrap.utils",
-    "sap/base/util/ObjectPath"
-], function (oAbapUtils, ObjectPath) {
+    "sap/base/util/ObjectPath",
+    "sap/base/Log"
+], function (
+    oAbapUtils,
+    ObjectPath,
+    Log
+) {
     "use strict";
 
     /* global URI */
@@ -46,7 +51,7 @@ sap.ui.define([
                 );
             }
         } else {
-            sap.ui2.srvc.log.error("Cannot handle event with type: " + oEvent.type,
+            Log.error("Cannot handle event with type: " + oEvent.type,
                 null, "sap.ushell_abap.bootstrap.evo.XhrLogonEventHandler");
         }
 
@@ -151,7 +156,7 @@ sap.ui.define([
         if (!this._isPageReloaded()) {
             // not in reload case, try reload once
             // no translation in fallback case
-            sap.ui2.srvc.log.error(
+            Log.error(
                 "Illegal state: XHR authentication (mode=reload) requested before SAPUI5 is initialized. "
                 + "This should not happen if the FioriLaunchpad.html page is loaded from the server. Trying to reload page once.",
                 null, "sap.ushell_abap.bootstrap.evo.XhrLogonEventHandler"
@@ -163,7 +168,7 @@ sap.ui.define([
             fnReload.call(this);
         } else {
             // reload already triggered at least once, giving up
-            sap.ui2.srvc.log.error(
+            Log.error(
                 "Illegal state: XHR authentication (mode=reload) requested before SAPUI5 is initialized and page reload has been triggered once."
                 + " Stopping reload to avoid endless loop. This state cannot be overcome. Please ensure that the FioriLaunchpad.html"
                 + " page is not cached, but always loaded from the server.",
@@ -191,10 +196,8 @@ sap.ui.define([
         // but this might trigger module loading as well normally, the 2 required modules should be part of the fiori-lib preload package,
         // so the fallback should not occur under normal circumstances
         if (sap && sap.ui && (typeof sap.ui.getCore === "function")
-            && sap.ui.getCore().isInitialized() && jQuery.sap.isDeclared("sap.m.MessageBox", true)) {
-            jQuery.sap.require("sap.m.MessageBox"); // TODO: remove jQuery.sap
-            if (jQuery.sap.isDeclared("sap.ushell.resources", true)) {
-                jQuery.sap.require("sap.ushell.resources"); // TODO: remove jQuery.sap
+            && sap.ui.getCore().isInitialized() && sap.ui.require("sap/m/MessageBox")) {
+            if (sap.ui.require("sap/ushell/resources")) {
                 sTitle = this._getText(oTitleText);
                 sMessage = this._getText(oMessageText);
             }
@@ -205,8 +208,7 @@ sap.ui.define([
             // Therefore we overwrite the 'show' method of the sap.ui.core.BusyIndicator class with an empty implementation body.
             // In case a 'show' call of the busy indicator with a delay is triggered, we need to stop that with a respective 'hide' call.
             // As the FLP gets reloaded afterwards, we do not need to apply the old logic of 'show' again.
-            if (jQuery.sap.isDeclared("sap.ui.core.BusyIndicator", true)) {
-                jQuery.sap.require("sap.ui.core.BusyIndicator"); // TODO: remove jQuery.sap
+            if (sap.ui.require("sap/ui/core/BusyIndicator")) {
                 if (typeof sap.ui.core.BusyIndicator.show === "function" &&
                     typeof sap.ui.core.BusyIndicator.hide === "function") {
                     sap.ui.core.BusyIndicator.hide();

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

@@ -9,7 +9,7 @@ sap.ui.define([
     "sap/ushell/bootstrap/common/common.configure.ui5.extractLibs",
     "sap/ushell/bootstrap/common/common.debug.mode",
     "sap/ushell/bootstrap/common/common.load.bootstrapExtension",
-    "sap/ui2/srvc/chip"
+    "sap/ushell_abap/pbServices/ui2/Chip"
 ], function (
     fnConfigureUshell,
     oUi5BootHandler,

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

@@ -11,7 +11,7 @@ sap.ui.define([
     "sap/ushell/bootstrap/common/common.debug.mode",
     "sap/ushell/bootstrap/common/common.load.core-min",
     "sap/ushell/bootstrap/common/common.preload.module",
-    "sap/ui2/srvc/chip"
+    "sap/ushell_abap/pbServices/ui2/Chip"
 ], function (
     fnConfigureUshell,
     oUi5BootHandler,

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

@@ -3,8 +3,12 @@
 sap.ui.define([
     "sap/ushell/utils",
     "sap/base/util/ObjectPath",
-    "sap/ui2/srvc/utils"
-], function (oUshellUtils, ObjectPath/*, oUi2Utils*/) {
+    "sap/ushell_abap/pbServices/ui2/Utils"
+], function (
+    oUshellUtils,
+    ObjectPath,
+    Utils
+) {
     "use strict";
 
     var utils = {};
@@ -19,7 +23,7 @@ sap.ui.define([
      * @private
      */
     utils.getUrlParameterValue = function (sValue, mMap) {
-        var mParameterMap = mMap || sap.ui2.srvc.getParameterMap();
+        var mParameterMap = mMap || Utils.getParameterMap();
         return mParameterMap[sValue] && mParameterMap[sValue][0];
     };
 
@@ -122,7 +126,7 @@ sap.ui.define([
     /**
      * Merge the object oConfigToMerge into oMutatedConfig according to
      * sap-ushell-config merge rules Note that the JSON serialized content of
-     * oConfigToMerge is used, thus JSON serialization limitations apply (e.g.
+     * oConfigToMerge is used, thus JSON serialization restrictions apply (e.g.
      * Infinity -> null ) Note that it is thus not possible to remove a
      * property definition or overriding with  {"propname" : undefined}, one
      * has to override with null or 0 etc.

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.94.0
+ * @version 1.96.1
  */
 sap.ui.define([
     "./abap.constants",

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

@@ -161,6 +161,15 @@ sap.ui.define([
                     "sap.m": true,
                     "sap.ushell": true
                 }
+            },
+            // default for the UI5_PLACEHOLDER_SCREEN parameter is evaluated from "Manage Launchpad Settings"
+            // app via ConfigurationDefaults service and has therefore be defined in client constants
+            // (was false in 2111)
+            // this setting is only evaluated by Fiori Elements framework and shall be removed in a future release
+            apps: {
+                placeholder: {
+                    enabled: true
+                }
             }
         }
     };

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.get.server.config.Urls.js

@@ -5,8 +5,15 @@
  */
 sap.ui.define([
     "./abap.validate.Url",
-    "sap/base/util/ObjectPath"
-], function (fnValidateUrl, ObjectPath) {
+    "sap/base/util/ObjectPath",
+    "sap/ushell_abap/pbServices/ui2/Utils",
+    "sap/base/Log"
+], function (
+    fnValidateUrl,
+    ObjectPath,
+    Utils,
+    Log
+) {
     "use strict";
 
     return getServerConfigUrls;
@@ -64,7 +71,7 @@ sap.ui.define([
 
         // try url parameter if no hardcoded url
         sHardcodedUrlOrParameterUrl = sHardcodedUrlOrParameterUrl || (
-            sap.ui2.srvc.getParameterMap()["sap-ushell-config-url"] && sap.ui2.srvc.getParameterMap()["sap-ushell-config-url"][0]
+            Utils.getParameterMap()["sap-ushell-config-url"] && Utils.getParameterMap()["sap-ushell-config-url"][0]
         );
 
         if (typeof sHardcodedUrlOrParameterUrl !== "undefined") {
@@ -74,7 +81,7 @@ sap.ui.define([
 
             sValidationFailReason = fnValidateUrl(sHardcodedUrlOrParameterUrl, oAllowlist);
             if (typeof sValidationFailReason !== "undefined") {
-                sap.ui2.srvc.log.error(sValidationFailReason, null, "sap.ushell_abap.bootstrap");
+                Log.error(sValidationFailReason, null, "sap.ushell_abap.bootstrap");
             } else {
                 aRequestUrls.push(sHardcodedUrlOrParameterUrl);
             }
@@ -91,7 +98,7 @@ sap.ui.define([
             }
         });
         if (aDuplicateUrls.length > 0) {
-            sap.ui2.srvc.log.error([
+            Log.error([
                 "Duplicate Urls found in server configuration:", aDuplicateUrls.join(", ")
             ].join(" "), null, "sap.ushell_abap.bootstrap");
         }

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

@@ -2,26 +2,27 @@
 sap.ui.define([
     "sap/base/util/UriParameters",
     "sap/base/Log",
-    "sap/ui2/srvc/chip",
-    "sap/ui2/srvc/bag",
-    "sap/ui2/srvc/contracts/bag",
-    "sap/ui2/srvc/contracts/configuration",
-    "sap/ui2/srvc/contracts/configurationUi",
-    "sap/ui2/srvc/contracts/fullscreen",
-    "sap/ui2/srvc/contracts/preview",
-    "sap/ui2/srvc/contracts/visible",
-    "sap/ui2/srvc/contracts/refresh",
-    "sap/ui2/srvc/contracts/searchProvider",
-    "sap/ui2/srvc/contracts/search",
-    "sap/ui2/srvc/contracts/url",
-    "sap/ui2/srvc/contracts/actions",
-    "sap/ui2/srvc/contracts/types",
-    "sap/ui2/srvc/error"
+    "sap/ushell_abap/pbServices/ui2/Chip",
+    "sap/ushell_abap/pbServices/ui2/Error",
+    "sap/ushell_abap/pbServices/ui2/Bag",
+    "sap/ushell_abap/pbServices/ui2/contracts/bag",
+    "sap/ushell_abap/pbServices/ui2/contracts/configuration",
+    "sap/ushell_abap/pbServices/ui2/contracts/configurationUi",
+    "sap/ushell_abap/pbServices/ui2/contracts/fullscreen",
+    "sap/ushell_abap/pbServices/ui2/contracts/preview",
+    "sap/ushell_abap/pbServices/ui2/contracts/visible",
+    "sap/ushell_abap/pbServices/ui2/contracts/refresh",
+    "sap/ushell_abap/pbServices/ui2/contracts/search",
+    "sap/ushell_abap/pbServices/ui2/contracts/url",
+    "sap/ushell_abap/pbServices/ui2/contracts/actions",
+    "sap/ushell_abap/pbServices/ui2/contracts/types"
 ], function (
     UriParameters,
-    Log
+
+    Log,
+    Chip,
+    SrvcError
     /*
-    ui2Chip,
     ui2Bag,
     ui2ContractsBag,
     ui2Configuration,
@@ -30,12 +31,10 @@ sap.ui.define([
     ui2Preview,
     ui2Visible,
     ui2Refresh,
-    ui2SearchProvider,
     ui2Search,
     ui2Url,
     ui2Actions,
-    ui2Types,
-    ui2Error
+    ui2Types
     */
 ) {
     "use strict";
@@ -77,9 +76,9 @@ sap.ui.define([
         }
 
         //TODO inserted to support chips requesting this contract unecessarily
-        sap.ui2.srvc.Chip.addContract("navigation", function (oChipInstance) {
+        Chip.addContract("navigation", function (oChipInstance) {
             this.navigateToUrl = function (sUrl, oSettings) {
-                throw new sap.ui2.srvc.Error("'navigation' contract not implemented!",
+                throw new SrvcError("'navigation' contract not implemented!",
                     "sap.ushell.adapters.abap.LaunchPageAdapter");
             };
         });

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.request.pageset.js

@@ -3,8 +3,14 @@
 sap.ui.define([
     "./abap.bootstrap.utils",
     "sap/ui/thirdparty/jquery",
+    "sap/ushell_abap/pbServices/ui2/Utils",
     "sap/base/Log"
-], function (oAbapUtils, jQuery, Log) {
+], function (
+    oAbapUtils,
+    jQuery,
+    Utils,
+    Log
+) {
     "use strict";
 
     /* global OData */
@@ -149,7 +155,7 @@ sap.ui.define([
         // the responses from the "cache", even if UI5 bootstrap is faster than the
         // OData requests
         sap.ui.require(["sap/ui/thirdparty/datajs"], function (datajs) {
-            OData.read.$cache = OData.read.$cache || new sap.ui2.srvc.Map();
+            OData.read.$cache = OData.read.$cache || new Utils.Map();
             OData.read.$cache.put(sUrl, oDeferred.promise());
         });
         return oDeferred;

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.request.server.config.js

@@ -6,8 +6,11 @@
  */
 sap.ui.define([
     "./abap.get.server.config.Urls",
-    "sap/ui2/srvc/utils"
-], function (fnGetServerConfigUrls /*, oUtil */) {
+    "sap/ushell_abap/pbServices/ui2/Utils"
+], function (
+    fnGetServerConfigUrls,
+    Utils
+) {
     "use strict";
 
     return requestServerConfig;
@@ -43,7 +46,7 @@ sap.ui.define([
 
         aRequestedPromise = aConfigUrls.map(function (sUrl, iIdx) {
             return new Promise(function (resolve, reject) {
-                sap.ui2.srvc.get(
+                Utils.get(
                     sUrl,
                     false, /*xml=*/
                     function (sResponseText) {