@sapui5/sap.ushell_abap 1.94.0 → 1.96.1

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
- * @version 1.94.0
+ * @version 1.96.1
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI",
@@ -14,9 +14,12 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/base/util/deepExtend",
     "sap/ushell/utils/chipsUtils",
-    "sap/ui2/srvc/chipinstance",
-    "sap/ui2/srvc/catalog",
-    "sap/ui2/srvc/chipdefinition"
+    "sap/ushell_abap/pbServices/ui2/ChipInstance",
+    "sap/ushell_abap/pbServices/ui2/Catalog",
+    "sap/ushell_abap/pbServices/ui2/ChipDefinition",
+    "sap/ushell_abap/pbServices/ui2/Utils",
+    "sap/ushell_abap/pbServices/ui2/Page",
+    "sap/ushell_abap/pbServices/ui2/Error"
 ], function (
     URI,
     ManifestPropertyHelper,
@@ -26,10 +29,13 @@ sap.ui.define([
     GenericTile,
     Config,
     deepExtend,
-    chipsUtils
-    // chipinstance
-    // catalog
-    // chipdefinition
+    chipsUtils,
+    ChipInstance,
+    Catalog,
+    ChipDefinition,
+    Utils,
+    Page,
+    SrvcError
 ) {
     "use strict";
 
@@ -71,7 +77,7 @@ sap.ui.define([
 
             // Stores a boolean that indicates whether a target mapping is supported on the current device.
             // One should use makeTargetMappingSupportKey to store and retrieve values to/from this map.
-            oTargetMappingSupport = new sap.ui2.srvc.Map(),
+            oTargetMappingSupport = new Utils.Map(),
 
             oAdapterConfig = (oAdapterConfiguration && oAdapterConfiguration.config) || {},
             oTargetMappingServiceConfig = oAdapterConfig.services && oAdapterConfig.services.targetMappings,
@@ -97,9 +103,9 @@ sap.ui.define([
         }
 
         /**
-         * Robust call to <code>sap.ui2.srvc.ChipInstance#getImplementationAsSapui5()</code>.
+         * Robust call to <code>sap.ushell_abap.pbServices.ui2.ChipInstance#getImplementationAsSapui5()</code>.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oTile Title object
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile Title object
          * @param {string} sTitle Title string
          * @param {string} sMessage Message string
          * @returns {sap.ui.core.Control} Implementation
@@ -131,10 +137,10 @@ sap.ui.define([
          * @param {string} sTextName Text name to check for
          * @returns {string} Value for sTextName, or undefined if not found
          * @private
-         * @see sap.ui2.srvc.ChipInstance#getBag
-         * @see sap.ui2.srvc.ChipInstance#getBagIds
-         * @see sap.ui2.srvc.Bag#getText
-         * @see sap.ui2.srvc.Bag#getTextNames
+         * @see sap.ushell_abap.pbServices.ui2.ChipInstance#getBag
+         * @see sap.ushell_abap.pbServices.ui2.ChipInstance#getBagIds
+         * @see sap.ushell_abap.pbServices.ui2.Bag#getText
+         * @see sap.ushell_abap.pbServices.ui2.Bag#getTextNames
          */
         LaunchPageAdapter.prototype._getBagText = function (oChip, sBagId, sTextName) {
             // calling getBag directly, will create the bag if it does not exist yet!
@@ -156,7 +162,7 @@ sap.ui.define([
          * @param {string} sPropertyName Name of the property which is expected on the parsed object value from sConfigParameterId
          * @returns {string} Value for sPropertyName, or undefined if not found or an error occurred (e.g. due to failed parsing)
          * @private
-         * @see sap.ui2.srvc.ChipInstance#getConfigurationParameter
+         * @see sap.ushell_abap.pbServices.ui2.ChipInstance#getConfigurationParameter
          */
         LaunchPageAdapter.prototype._getConfigurationProperty = function (oChip, sConfigParameterId, sPropertyName) {
             var sTileConfig,
@@ -190,7 +196,7 @@ sap.ui.define([
          * @since 1.11.0
          */
         LaunchPageAdapter.prototype._orderBasedOnConfiguration = function (oConfiguration, aElements) {
-            var aOrder = (oConfiguration && sap.ui2.srvc.isArray(oConfiguration.order) ? oConfiguration.order : []),
+            var aOrder = (oConfiguration && Utils.isArray(oConfiguration.order) ? oConfiguration.order : []),
                 mElementsById = {},
                 aOrderedElements = [],
                 oElement,
@@ -199,7 +205,7 @@ sap.ui.define([
                 n;
 
             // append link tiles as they are exposed together with tiles via getGroupTiles
-            aOrder = aOrder.concat(oConfiguration && sap.ui2.srvc.isArray(oConfiguration.linkOrder) ? oConfiguration.linkOrder : []);
+            aOrder = aOrder.concat(oConfiguration && Utils.isArray(oConfiguration.linkOrder) ? oConfiguration.linkOrder : []);
 
             // create a map of instances by ID
             for (i = 0, n = aElements.length; i < n; i += 1) {
@@ -234,7 +240,7 @@ sap.ui.define([
          *     linkOrder: ["linkTileId1", "linkTileId2"]
          *   }
          *   </code>
-         * @param {sap.ui2.srvc.ChipInstance} oTile The tile to be removed
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile The tile to be removed
          * @param {string} sCurrentTileType "link" or "tile"
          * @returns {integer} the index of the oTile if found. Otherwise -1 is returned
          * @private
@@ -293,7 +299,7 @@ sap.ui.define([
         /**
          * Calculates the layout object for the given Page. The layout
          *
-         * @param {sap.ui2.srvc.Page} oPage The Page the layout is calculated for.
+         * @param {sap.ushell_abap.pbServices.ui2.Page} oPage The Page the layout is calculated for.
          * @param {sap.ushell_abap.adapters.abap.LaunchPageAdapter} oAdapter The instance of the LaunchPageAdapter (this).
          * @returns {object} The calculated Page layout
          *   <code>
@@ -326,7 +332,7 @@ sap.ui.define([
         /**
          * Orders the pages of _oCurrentPageSet based on the configuration maintained in _oCurrentPageSet and returns the result.
          *
-         * @returns {sap.ui2.srvc.Page[]}
+         * @returns {sap.ushell_abap.pbServices.ui2.Page[]}
          * @private
          */
         function getOrderedPages () {
@@ -374,7 +380,7 @@ sap.ui.define([
          * Checks if the provided group should be visible or hidden.
          * It is decided according the group ID (oGroup should have a getId function).
          *
-         * @param {sap.ui2.srvc.Page} oGroup The group to be checked.
+         * @param {sap.ushell_abap.pbServices.ui2.Page} oGroup The group to be checked.
          * @returns {boolean} true\false accordingly.
          * @private
          */
@@ -436,7 +442,7 @@ sap.ui.define([
          * Triggers loading of all ChipInstances of the given pages and calls fnLocalChipsLoaded
          * when all local CHIP instances are completely loaded.
          *
-         * @param {sap.ui2.srvc.Page[]} aPages the pages
+         * @param {sap.ushell_abap.pbServices.ui2.Page[]} aPages the pages
          * @param {function} fnLocalChipsLoaded Success handler which is called as soon as all LOCAL CHIPs are completely loaded.
          * @private
          */
@@ -589,7 +595,7 @@ sap.ui.define([
                 sUrl += (sUrl.indexOf("?") < 0 ? "?" : "&") + "sap-ui2-cache-disable=" + sUI2CacheDisable;
             }
 
-            sap.ui2.srvc.get(
+            Utils.get(
                 sUrl,
                 false, /*xml=*/
                 function (sDirectStartResult) {
@@ -622,7 +628,7 @@ sap.ui.define([
          * This is the case for the results of {@link #addTile}, but not for {@link #addBookmark}.
          * Such wrappers must be unwrapped by {@link #moveTile} or else the title becomes "hard coded" in the newly created CHIP instance.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oTile
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile
          * @returns {boolean}
          */
         LaunchPageAdapter.prototype._isWrapperOnly = function (oTile) {
@@ -636,12 +642,12 @@ sap.ui.define([
         /**
          * Wraps the given CHIPs as CHIP instances, filtering out action CHIPs.
          *
-         * @param {sap.ui2.srvc.Chip[]} aChips array of chips
-         * @returns {sap.ui2.srvc.ChipInstance[]} array of chip instances
+         * @param {sap.ushell_abap.pbServices.ui2.Factory} oFactory The factory to create new chip instances.
+         * @param {sap.ushell_abap.pbServices.ui2.Chip[]} aChips A list of chips.
+         * @returns {sap.ushell_abap.pbServices.ui2.ChipInstance[]} A list of chip instances.
          */
-        function wrapAsChipInstances (aChips) {
-            var aChipInstances = [],
-                oFactory = sap.ushell.Container.getService("PageBuilding").getFactory();
+        function wrapAsChipInstances (oFactory, aChips) {
+            var aChipInstances = [];
 
             aChips.forEach(function (oChip) {
                 var oRemoteCatalog = oChip.getRemoteCatalog(),
@@ -663,11 +669,11 @@ sap.ui.define([
         /**
          * Wraps the current <code>allCatalogs</code> collection into black box objects.
          *
-         * @returns {Array}
-         *
+         * @returns {object[]} A list of catalog objects.
+         * @param {sap.ushell_abap.pbServices.ui2.Factory} oFactory The factory to create new chip instances.
          * TODO cache result?!
          */
-        function wrapCatalogs () {
+        function wrapCatalogs (oFactory) {
             var oAllCatalogs = that._oCurrentPageSet.getDefaultPage().getAllCatalogs(),
                 oCatalog,
                 aCatalogs = oAllCatalogs.getCatalogs(),
@@ -686,7 +692,7 @@ sap.ui.define([
                         : oCatalog.getTitle(),
                     tiles: oCatalog.isStub()
                         ? []
-                        : wrapAsChipInstances(oCatalog.getChips()),
+                        : wrapAsChipInstances(oFactory, oCatalog.getChips()),
                     ui2catalog: oCatalog // for convenience
                 });
             }
@@ -696,7 +702,7 @@ sap.ui.define([
 
         /**
          * Tells whether the given CHIP instance is a static or dynamic app launcher
-         * @param {sap.ui2.srvc.ChipInstance} oChipInstance
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oChipInstance
          * @returns {boolean}
          */
         function isAppLauncher (oChipInstance) {
@@ -706,7 +712,7 @@ sap.ui.define([
 
         /**
          * Tells whether the given CHIP instance is a card
-         * @param {sap.ui2.srvc.ChipInstance} oChipInstance
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oChipInstance
          * @returns {boolean}
          */
         function isCard (oChipInstance) {
@@ -716,7 +722,7 @@ sap.ui.define([
 
         /**
          * Tells whether the given CHIP instance is remote
-         * @param {sap.ui2.srvc.ChipInstance} oChipInstance
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oChipInstance
          * @returns {boolean}
          */
         function isRemoteChipInstance (oChipInstance) {
@@ -729,7 +735,7 @@ sap.ui.define([
          *
          * Note: If this method returns false does not mean that the later loading will not fail
          *
-         * @param {sap.ui2.srvc.ChipInstance} oChipInstance
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oChipInstance
          * @returns {boolean}
          */
         function isBrokenChip (oChipInstance) {
@@ -741,7 +747,7 @@ sap.ui.define([
          * Returns the tile configuration of the given (app launcher) CHIP instance.
          * It logs an error message if the tile configuration cannot be parsed.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oChipInstance must not be a stub anymore. Also it's CHIP must not be a stub anymore.
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oChipInstance must not be a stub anymore. Also it's CHIP must not be a stub anymore.
          * @returns {object} the tile configuration
          */
         function getAppLauncherTileConfiguration (oChipInstance) {
@@ -765,7 +771,7 @@ sap.ui.define([
          * Returns the tile configuration of the given (Smart Business) CHIP instance.
          * It logs an error message if the tile configuration cannot be parsed.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oChipInstance must not be a stub anymore. Also it's CHIP must not be a stub anymore.
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oChipInstance must not be a stub anymore. Also it's CHIP must not be a stub anymore.
          * @returns {object} the tile configuration in style of an applauncer
          */
         function getSmartBusinessTileConfiguration (oChipInstance) {
@@ -800,7 +806,7 @@ sap.ui.define([
          * Returns the tile configuration of the given custom CHIP instance, but only if it uses the same configuration structure
          * as the standard static and dynamic app launcher or if it uses the Smart Business tiles' configuration structure.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oChipInstance It's CHIP may still be a stub.
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oChipInstance It's CHIP may still be a stub.
          * @returns {object} the tile configuration or an empty object
          */
         function getCustomTileConfiguration (oChipInstance) {
@@ -885,7 +891,7 @@ sap.ui.define([
         };
 
         /**
-         * @returns {sap.ui2.srvc.Map} all supported target mappings
+         * @returns {sap.ushell_abap.pbServices.ui2.Map} all supported target mappings
          */
         this.getTargetMappingSupport = function () {
             return oTargetMappingSupport;
@@ -967,8 +973,8 @@ sap.ui.define([
          * It logs at most two messages (one warning and one error), grouping errors by groups and error type.
          * </p>
          *
-         * @param {sap.ui2.srvc.Page[]} aPages an array of all the pages.
-         * @param {sap.ui2.srvc.Map} oTargetMappingSupport a map containing whether an intent is supported taking into
+         * @param {sap.ushell_abap.pbServices.ui2.Page[]} aPages an array of all the pages.
+         * @param {sap.ushell_abap.pbServices.ui2.Map} oTargetMappingSupport a map containing whether an intent is supported taking into
          *   account its form factor.
          * @private
          */
@@ -983,8 +989,8 @@ sap.ui.define([
         /**
          * Finds errors on tiles in all Groups.
          *
-         * @param {array} aPages an array of <code>sap.ui2.srvc.Page</code> objects representing groups of tiles.
-         * @param {sap.ui2.srvc.Map} oTargetMappingSupport a map containing whether an intent is supported taking into
+         * @param {array} aPages an array of <code>sap.ushell_abap.pbServices.ui2.Page</code> objects representing groups of tiles.
+         * @param {sap.ushell_abap.pbServices.ui2.Map} oTargetMappingSupport a map containing whether an intent is supported taking into
          *   account its form factor.
          * @returns {array} An array describing each error found.
          * @private
@@ -1003,8 +1009,8 @@ sap.ui.define([
         /**
          * Finds possible errors on tiles in a given Group.
          *
-         * @param {object} oPage an <code>sap.ui2.srvc.Page</code> object representing a group of tiles.
-         * @param {sap.ui2.srvc.Map} oTargetMappingSupport a map containing whether an intent is supported taking into
+         * @param {object} oPage an <code>sap.ushell_abap.pbServices.ui2.Page</code> object representing a group of tiles.
+         * @param {sap.ushell_abap.pbServices.ui2.Map} oTargetMappingSupport a map containing whether an intent is supported taking into
          *   account its form factor.
          * @returns {array} An array describing each error found
          * @private
@@ -1220,136 +1226,132 @@ sap.ui.define([
 
         /**
          * Returns the groups of the user. This is an asynchronous function using a jQuery.Promise.
-         * In case of success its <code>done</code> function is called and gets an array of <code>sap.ui2.srvc.Page</code> objects.
+         * In case of success its <code>done</code> function is called and gets an array of <code>sap.ushell_abap.pbServices.ui2.Page</code> objects.
          * These page objects can be passed in to all functions expecting a group.
          *
          * The first group in this list is considered the default group.
          *
          * In case of error the promise's <code>fail</code> function is called.
          *
-         * @returns {object} jQuery.Promise object.
+         * @returns {jQuery.Promise} jQuery.Promise object.
          * @since 1.11.0
          */
         this.getGroups = function () {
-            var that = this,
-                oDeferred, // the deferred used for page set loading
-                oMappingPromise, // the promise of readMappingTargets
-                oUshellPbs; // ushell service PageBuilding
-
-            if (that._bPageSetFullyLoaded) {
+            if (this._bPageSetFullyLoaded) {
                 // return the already known page set (the order is recomputed because the page set might have changed it since last call)
-                return (new jQuery.Deferred()).resolve(getOrderedPages()).promise();
+                return new jQuery.Deferred().resolve(getOrderedPages()).promise();
             }
             if (!oGetGroupsDeferred) {
                 // start a new request and remember it in oGetGroupsDeferred, so that parallel calls don't start another one
                 oGetGroupsDeferred = new jQuery.Deferred();
-                oDeferred = new jQuery.Deferred();
-                oUshellPbs = sap.ushell.Container.getService("PageBuilding");
+                var oDeferred = new jQuery.Deferred();
 
-                if (oLaunchPageServiceConfig && oLaunchPageServiceConfig.cacheId) {
-                    // add PageSet cache buster token if configured
-                    oUshellPbs.getFactory().getPageBuildingService().readPageSet.cacheBusterTokens
-                        .put(sDEFAULT_PAGE_ID, oLaunchPageServiceConfig.cacheId);
-                }
-                if (oLaunchPageServiceConfig && oLaunchPageServiceConfig["sap-ui2-cache-disable"]
-                    && oUshellPbs.getFactory().getPageBuildingService().readPageSet) {
-                    var oAppendedParameters = oUshellPbs.getFactory().getPageBuildingService().readPageSet.appendedParameters || {};
-                    oAppendedParameters["sap-ui2-cache-disable"] = oLaunchPageServiceConfig["sap-ui2-cache-disable"];
-                    oUshellPbs.getFactory().getPageBuildingService().readPageSet.appendedParameters = oAppendedParameters;
-                }
+                sap.ushell.Container.getServiceAsync("PageBuilding")
+                    .then(function (PageBuildingService) {
+                        var fnReadPageSet = PageBuildingService.getFactory().getPageBuildingService().readPageSet;
 
-                /*
-                The target mappings are used in the classic homepage and in spaces mode.
-                 */
-                oMappingPromise = this._readTargetMappings().done(function (oTargetMappings) {
-                    var sFormFactor = sap.ui2.srvc.getFormFactor();
-
-                    oTargetMappings.results.forEach(function (oTargetMapping) {
-                        var sKey = LaunchPageAdapter.prototype._makeTargetMappingSupportKey(
-                            oTargetMapping.semanticObject,
-                            oTargetMapping.semanticAction
-                        );
-
-                        oTargetMappingSupport.put(sKey,
-                            // make sure it's boolean
-                            oTargetMappingSupport.get(sKey)
-                            || !!(oTargetMapping.formFactors && oTargetMapping.formFactors[sFormFactor]));
-                    });
-                });
-
-                /* In spaces mode we will create an empty page inside an empty pageset.
-                This is needed because the appfinder and search integration request the classic homepage content which is not available in spaces mode.
-                For consistency reasons it should then also not be availabe from the search results.
-                The empty pageset has all needed functions the real pageset has.
-                Functions which should not be used in spaces mode throw an error
-                 */
-                if (Config.last("/core/spaces/enabled")) {
-                    sap.ushell.Container.getServiceAsync("PageBuilding").then(function (oPageBuilding) {
-                        var oFactory = oPageBuilding.getFactory();
-
-                        var oFakeDefaultPage = new sap.ui2.srvc.Page(oFactory, {
-                            id: PAGE_ID_WITHOUT_TM
-                        });
+                        if (oLaunchPageServiceConfig && oLaunchPageServiceConfig.cacheId) {
+                            // add PageSet cache buster token if configured
+                            fnReadPageSet.cacheBusterTokens
+                                .put(sDEFAULT_PAGE_ID, oLaunchPageServiceConfig.cacheId);
+                        }
+                        if (oLaunchPageServiceConfig && oLaunchPageServiceConfig["sap-ui2-cache-disable"] && fnReadPageSet) {
+                            var oAppendedParameters = fnReadPageSet.appendedParameters || {};
+                            oAppendedParameters["sap-ui2-cache-disable"] = oLaunchPageServiceConfig["sap-ui2-cache-disable"];
+                            fnReadPageSet.appendedParameters = oAppendedParameters;
+                        }
 
-                        var oEmptyPageSet = {
-                            getDefaultPage: function () {
-                                return oFakeDefaultPage;
-                            },
-                            getPages: function () {
-                                return [oFakeDefaultPage];
-                            },
-                            appendPage: function () {
-                                throw new Error("Not implemented in Pages Runtime");
-                            },
-                            isPageRemovable: function () {
-                                return false;
-                            },
-                            removePage: function () {
-                                throw new Error("Not implemented in Pages Runtime");
-                            },
-                            isPageResettable: function () {
-                                return true;
-                            },
-                            resetPage: function () {
-                            },
-                            getConfiguration: function () {
-                                return "{}";
-                            },
-                            setConfiguration: function () {
-                            },
-                            filter: function () {
-                            }
-                        };
+                        /*
+                        The target mappings are used in the classic homepage and in spaces mode.
+                         */
+                        var oMappingPromise = this._readTargetMappings()
+                            .done(function (oTargetMappings) {
+                                var sFormFactor = Utils.getFormFactor();
+
+                                oTargetMappings.results.forEach(function (oTargetMapping) {
+                                    var sKey = LaunchPageAdapter.prototype._makeTargetMappingSupportKey(
+                                        oTargetMapping.semanticObject,
+                                        oTargetMapping.semanticAction
+                                    );
+
+                                    oTargetMappingSupport.put(sKey,
+                                        // make sure it's boolean
+                                        oTargetMappingSupport.get(sKey)
+                                        || !!(oTargetMapping.formFactors && oTargetMapping.formFactors[sFormFactor]));
+                                });
+                            });
 
-                        that._oCurrentPageSet = oEmptyPageSet;
-                        oGetGroupsDeferred.resolve([]);
-                    });
-                } else {
-                    var oPageSetsPromise = oUshellPbs.getPageSet(sDEFAULT_PAGE_ID);
-
-                    oPageSetsPromise
-                        .fail(oDeferred.reject.bind(oDeferred))
-                        .done(function (oPageSet) {
-                            that._oCurrentPageSet = oPageSet;
-                            // remove unsupported pages before loading their chip instances
-                            that._oCurrentPageSet.filter([sDEFAULT_PAGE_ID], [sDEFAULT_CATALOG_ID]);
-                            // Trigger load of all CHIP instances, but wait for the locals only
-                            that._loadApplaunchersAndDelayLoadingOfOtherChips(oPageSet.getPages(),
-                                oDeferred.resolve.bind(oDeferred, oPageSet));
-                        });
+                        /*
+                        In spaces mode we will create an empty page inside an empty pageset.
+                        This is needed because the appfinder and search integration request the classic homepage content which is not available in spaces mode.
+                        For consistency reasons it should then also not be availabe from the search results.
+                        The empty pageset has all needed functions the real pageset has.
+                        Functions which should not be used in spaces mode throw an error
+                         */
+                        if (Config.last("/core/spaces/enabled")) {
+                            var oFactory = PageBuildingService.getFactory();
+
+                            var oFakeDefaultPage = new Page(oFactory, {
+                                id: PAGE_ID_WITHOUT_TM
+                            });
 
-                    jQuery.when(oMappingPromise, oDeferred)
-                        .done(function (oTargetMappings, oPageSet) {
-                            that._bPageSetFullyLoaded = true;
+                            that._oCurrentPageSet = {
+                                getDefaultPage: function () {
+                                    return oFakeDefaultPage;
+                                },
+                                getPages: function () {
+                                    return [oFakeDefaultPage];
+                                },
+                                appendPage: function () {
+                                    throw new Error("Not implemented in Pages Runtime");
+                                },
+                                isPageRemovable: function () {
+                                    return false;
+                                },
+                                removePage: function () {
+                                    throw new Error("Not implemented in Pages Runtime");
+                                },
+                                isPageResettable: function () {
+                                    return true;
+                                },
+                                resetPage: function () {
+                                },
+                                getConfiguration: function () {
+                                    return "{}";
+                                },
+                                setConfiguration: function () {
+                                },
+                                filter: function () {
+                                }
+                            };
 
-                            if (jQuery.sap.log.getLevel() >= jQuery.sap.log.Level.DEBUG) { // sap-ui-debug = true
-                                that._findAndReportTileErrors(oPageSet.getPages(), oTargetMappingSupport);
-                            }
+                            oGetGroupsDeferred.resolve([]);
+                        } else {
+                            var oPageSetsPromise = PageBuildingService.getPageSet(sDEFAULT_PAGE_ID);
+
+                            oPageSetsPromise
+                                .fail(oDeferred.reject.bind(oDeferred))
+                                .done(function (oPageSet) {
+                                    this._oCurrentPageSet = oPageSet;
+                                    // remove unsupported pages before loading their chip instances
+                                    this._oCurrentPageSet.filter([sDEFAULT_PAGE_ID], [sDEFAULT_CATALOG_ID]);
+                                    // Trigger load of all CHIP instances, but wait for the locals only
+                                    this._loadApplaunchersAndDelayLoadingOfOtherChips(oPageSet.getPages(), oDeferred.resolve.bind(oDeferred, oPageSet));
+                                }.bind(this));
+
+                            jQuery.when(oMappingPromise, oDeferred)
+                                .done(function (oTargetMappings, oPageSet) {
+                                    this._bPageSetFullyLoaded = true;
+
+                                    if (jQuery.sap.log.getLevel() >= jQuery.sap.log.Level.DEBUG) { // sap-ui-debug = true
+                                        this._findAndReportTileErrors(oPageSet.getPages(), oTargetMappingSupport);
+                                    }
 
-                            oGetGroupsDeferred.resolve(getOrderedPages());
-                        })
-                        .fail(oGetGroupsDeferred.reject.bind(oGetGroupsDeferred));
-                }
+                                    oGetGroupsDeferred.resolve(getOrderedPages());
+                                }.bind(this))
+                                .fail(oGetGroupsDeferred.reject.bind(oGetGroupsDeferred));
+                        }
+                    }.bind(this));
             }
 
             return oGetGroupsDeferred.promise();
@@ -1358,7 +1360,7 @@ sap.ui.define([
         /**
          * Returns the default group. This is an asynchronous function using a jQuery.Promise.
          * In case of success its <code>done</code> function is called and gets the
-         * <code>sap.ui2.srvc.Page</code> object representing the default group.
+         * <code>sap.ushell_abap.pbServices.ui2.Page</code> object representing the default group.
          *
          * In case of error the promise's <code>fail</code> function is called.
          *
@@ -1379,7 +1381,7 @@ sap.ui.define([
         /**
          * Returns the title of the given group.
          *
-         * @param {sap.ui2.srvc.Page} oGroup the group (as received via #getGroups())
+         * @param {sap.ushell_abap.pbServices.ui2.Page} oGroup the group (as received via #getGroups())
          * @returns {string} the group title
          * @since 1.11.0
          */
@@ -1390,7 +1392,7 @@ sap.ui.define([
         /**
          * Returns the unique identifier of the given group.
          *
-         * @param {sap.ui2.srvc.Page} oGroup the group (as received via #getGroups())
+         * @param {sap.ushell_abap.pbServices.ui2.Page} oGroup the group (as received via #getGroups())
          * @returns {string} the group id
          * @since 1.11.0
          */
@@ -1401,8 +1403,8 @@ sap.ui.define([
         /**
          * Returns the tiles of the given group.
          *
-         * @param {sap.ui2.srvc.Page} oGroup the group
-         * @returns {sap.ui2.srvc.ChipInstance[]} the tiles in the order to be displayed.
+         * @param {sap.ushell_abap.pbServices.ui2.Page} oGroup the group
+         * @returns {sap.ushell_abap.pbServices.ui2.ChipInstance[]} the tiles in the order to be displayed.
          * @since 1.11.0
          */
         this.getGroupTiles = function (oGroup) {
@@ -1419,12 +1421,12 @@ sap.ui.define([
 
         /**
          * Adds a new group. This is an asynchronous function using a jQuery.Promise.
-         * In case of success its <code>done</code> function is called and gets the added group as a <code>sap.ui2.srvc.Page</code>.
+         * In case of success its <code>done</code> function is called and gets the added group as a <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
          * Intention: the page builder adds this group to the end of the home screen.
          *
          * In case of error the promise's <code>fail</code> function is called and gets the
-         * consistent backend state of all groups as array of <code>sap.ui2.srvc.Page</code>.
+         * consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
          * @param {string} sTitle the title of the new group
          * @returns {object} a jQuery.Promise.
@@ -1445,7 +1447,7 @@ sap.ui.define([
          * In case of success its <code>done</code> function is called.
          *
          * In case of error the promise's <code>fail</code> function is called and gets the
-         * consistent backend state of all groups as array of <code>sap.ui2.srvc.Page</code>.
+         * consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
          * @param {object} oGroup the group to be removed
          * @returns {object} a jQuery.Promise
@@ -1469,9 +1471,9 @@ sap.ui.define([
          * This is an asynchronous function using a jQuery.Promise. In case of success its <code>done</code> function is called.
          *
          * In case of error the promise's <code>fail</code> function is called and gets the
-         * consistent backend state of all groups as array of <code>sap.ui2.srvc.Page</code>.
+         * consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
-         * @param {sap.ui2.srvc.Page} oGroup the group to be reset
+         * @param {sap.ushell_abap.pbServices.ui2.Page} oGroup the group to be reset
          * @returns {object} a jQuery.Promise
          * @since 1.11.0
          */
@@ -1548,7 +1550,7 @@ sap.ui.define([
          *
          * <p>This function will log a warning if a falsy value is returned.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oTile the group tile or catalog tile
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile the group tile or catalog tile
          * @returns {boolean} <code>true</code> if the tile's target intent is supported
          * @since 1.21.0
          */
@@ -1586,8 +1588,8 @@ sap.ui.define([
         /**
          * Implements the functionality described in the public <code>#isTileIntentSupported</code> without logging.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oTile the group tile or catalog tile
-         * @param {sap.ui2.srvc.Map} oTargetMappingSupport the tile target mapping support
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile the group tile or catalog tile
+         * @param {sap.ushell_abap.pbServices.ui2.Map} oTargetMappingSupport the tile target mapping support
          * @returns {object} An object reporting the support of the tile intent that
          *   looks like the following objects based on whether the tile intent is supported:
          *   <pre>
@@ -1658,7 +1660,7 @@ sap.ui.define([
                 // the assumption is that currently launcher tiles are always local CHIPs and for those getGroups is waiting.
                 // Thus this Error should newer be reached.
                 // If stub launchers shall be supported, it must found a way how to decided if they are supported.
-                throw new sap.ui2.srvc.Error("Applauncher Tile not loaded completely",
+                throw new SrvcError("Applauncher Tile not loaded completely",
                     "sap.ushell_abap.adapters.abap.LaunchPageAdapter");
             }
 
@@ -1703,7 +1705,7 @@ sap.ui.define([
          * Moves a group to a new index. This is an asynchronous function using a jQuery.Promise.
          * In case of success its <code>done</code> function is called.
          * In case of error the promise's <code>fail</code> function is called and gets the
-         * consistent backend state of all groups as array of <code>sap.ui2.srvc.Page</code>.
+         * consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
          * @param {object} oGroup the group to be moved
          * @param {integer} iNewIndex the new index for the group
@@ -1766,12 +1768,12 @@ sap.ui.define([
         /**
          * Adds a tile to the end of a group. The group is optional. If no group is given, use the default group.
          * This is an asynchronous function using a jQuery.Promise.
-         * In case of success its <code>done</code> function is called and gets the new tile as a <code>sap.ui2.srvc.ChipInstance</code>.
+         * In case of success its <code>done</code> function is called and gets the new tile as a <code>sap.ushell_abap.pbServices.ui2.ChipInstance</code>.
          * In case of error the promise's <code>fail</code> function is called and gets the
-         * consistent backend state of all groups as array of <code>sap.ui2.srvc.Page</code>.
+         * consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oCatalogTile an 'anonymous' catalog tile from the catalog browser
-         * @param {sap.ui2.srvc.Page} [oGroup] the group
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oCatalogTile an 'anonymous' catalog tile from the catalog browser
+         * @param {sap.ushell_abap.pbServices.ui2.Page} [oGroup] the group
          * @returns {object} a jQuery.Promise
          * @since 1.11.0
          */
@@ -1800,10 +1802,10 @@ sap.ui.define([
          * Removes the given tile from the given group. This is an asynchronous function using a jQuery.Promise.
          * In case of success its <code>done</code> function is called.
          * In case of error the promise's <code>fail</code> function is called and gets the
-         * consistent backend state of all groups as array of <code>sap.ui2.srvc.Page</code>.
+         * consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
-         * @param {sap.ui2.srvc.Page} oGroup the group containing the tile
-         * @param {sap.ui2.srvc.ChipInstance} oTile the tile
+         * @param {sap.ushell_abap.pbServices.ui2.Page} oGroup the group containing the tile
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile the tile
          * @returns {object} a jQuery.Promise
          * @since 1.11.0
          */
@@ -1820,31 +1822,25 @@ sap.ui.define([
          * Moves a tile to another location in the same or a different group. This is an asynchronous function using a jQuery.Promise.
          * In case of success its <code>done</code> function is called and gets the new target tile (which may be identical).
          * In case of error the promise's <code>fail</code> function is called and gets the
-         * consistent backend state of all groups as array of <code>sap.ui2.srvc.Page</code>.
+         * consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oTile the tile to be moved
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile the tile to be moved
          * @param {integer} iSourceIndex the index in the source group
          * @param {integer} iTargetIndex the index in the target group, in case this parameter is not supplied we assume the
          *   move tile is within the source group using iSourceIndex
-         * @param {sap.ui2.srvc.Page} oSourceGroup the tile's group
-         * @param {sap.ui2.srvc.Page} [oTargetGroup] the group the tile will be placed in or tile's group if not supplied
+         * @param {sap.ushell_abap.pbServices.ui2.Page} oSourceGroup the tile's group
+         * @param {sap.ushell_abap.pbServices.ui2.Page} [oTargetGroup] the group the tile will be placed in or tile's group if not supplied
          * @param {string} [sNewTileType] (added with 1.60) The new type of the tile
-         * @returns {object} a jQuery.Promise
+         * @returns {jQuery.Promise} A jQuery.Promise
          * @since 1.11.0
          */
         this.moveTile = function (oTile, iSourceIndex, iTargetIndex, oSourceGroup, oTargetGroup, sNewTileType) {
             var oDeferred = new jQuery.Deferred(),
                 bIsWrapperOnly = this._isWrapperOnly(oTile),
-                oPbs,
-                oBagsContents = new sap.ui2.srvc.Map(),
+                oBagsContents = new Utils.Map(),
                 oCreatedChipInstance,
-                aBagIds,
-                oSourceLayout,
-                oTargetLayout,
-                aTargetChipInstances,
                 fnFailure = oDeferred.reject.bind(oDeferred, getOrderedPages()),
-                iCalls = 2,
-                sOldTileType;
+                iCalls = 2;
 
             function resolveMoveBetweenGroups (oNewChipInstance) {
                 iCalls -= 1;
@@ -1860,9 +1856,10 @@ sap.ui.define([
             if (!oTargetGroup) {
                 oTargetGroup = oSourceGroup;
             }
-            oSourceLayout = calculateCurrentLayout(oSourceGroup, this);
-            oTargetLayout = calculateCurrentLayout(oTargetGroup, this);
-            sOldTileType = this.getTileType(oTile);
+
+            var oSourceLayout = calculateCurrentLayout(oSourceGroup, this);
+            var oTargetLayout = calculateCurrentLayout(oTargetGroup, this);
+            var sOldTileType = this.getTileType(oTile);
 
             iSourceIndex = removeFromLayout(oSourceLayout, oTile, sOldTileType);
             if (iSourceIndex < 0) {
@@ -1875,74 +1872,78 @@ sap.ui.define([
                 addToLayout(oSourceLayout, oTile.getId(), iTargetIndex, sNewTileType);
                 oSourceGroup.setLayout(JSON.stringify(oSourceLayout), oDeferred.resolve.bind(oDeferred, oTile), fnFailure);
             } else {
-                oPbs = sap.ushell.Container.getService("PageBuilding").getFactory().getPageBuildingService();
-
-                // store bag contents for later storing them in the new CHIP instances
-                aBagIds = oTile.getBagIds();
-                aBagIds.forEach(function (sBagId) {
-                    var oBagContent = {
-                        texts: [],
-                        properties: []
-                    },
-                        oBag = oTile.getBag(sBagId);
-                    // ignore contents of CHIP bags
-                    oBag.getOwnTextNames().forEach(function (sName) {
-                        oBagContent.texts.push({ name: sName, value: oBag.getText(sName) });
-                    });
-                    oBag.getOwnPropertyNames().forEach(function (sName) {
-                        oBagContent.properties.push({ name: sName, value: oBag.getProperty(sName) });
-                    });
-                    if (oBagContent.texts.length > 0 || oBagContent.properties.length > 0) {
-                        oBagsContents.put(sBagId, oBagContent);
-                    }
-                });
-
-                // one $batch to add tile to target group, remove old tile, update layout of source group
-                oPbs.openBatchQueue();
+                sap.ushell.Container.getServiceAsync("PageBuilding")
+                    .then(function (PageBuildingService) {
+                        var oActualPageBuildingService = PageBuildingService.getFactory().getPageBuildingService();
 
-                aTargetChipInstances = this.getGroupTiles(oTargetGroup);
-                oTargetGroup.addChipInstance(bIsWrapperOnly ? oTile.getChip() : oTile,
-                    function (oNewChipInstance) {
-                        var oCurrentBag, oBagContent;
-                        aTargetChipInstances.splice(iTargetIndex, 0, oNewChipInstance);
-                        // Note: additional requests after the $batch required, because new ID was previously unknown.
-                        // So this requests could not be batched together
-
-                        // Add bags to CHIP instance in target group
+                        // store bag contents for later storing them in the new CHIP instances
+                        var aBagIds = oTile.getBagIds();
                         aBagIds.forEach(function (sBagId) {
-                            oBagContent = oBagsContents.get(sBagId);
-                            if (oBagContent) {
-                                oCurrentBag = oNewChipInstance.getBag(sBagId);
-                                oBagContent.texts.forEach(function (oText) {
-                                    oCurrentBag.setText(oText.name, oText.value);
-                                });
-                                oBagContent.properties.forEach(function (oProperty) {
-                                    oCurrentBag.setProperty(oProperty.name, oProperty.value);
-                                });
-                                oCurrentBag.save(function () {
-                                    // don't wait for the save operation for performance reasons
-                                }, function () {
-                                    jQuery.sap.log.error("Bag " + sBagId + ": could not be saved", null, sCOMPONENT);
-                                });
+                            var oBagContent = {
+                                    texts: [],
+                                    properties: []
+                                },
+                                oBag = oTile.getBag(sBagId);
+                            // ignore contents of CHIP bags
+                            oBag.getOwnTextNames().forEach(function (sName) {
+                                oBagContent.texts.push({ name: sName, value: oBag.getText(sName) });
+                            });
+                            oBag.getOwnPropertyNames().forEach(function (sName) {
+                                oBagContent.properties.push({ name: sName, value: oBag.getProperty(sName) });
+                            });
+                            if (oBagContent.texts.length > 0 || oBagContent.properties.length > 0) {
+                                oBagsContents.put(sBagId, oBagContent);
                             }
                         });
-                        // update order of tiles, which is stored in the layout property
-                        addToLayout(oTargetLayout, oNewChipInstance.getId(), iTargetIndex, sNewTileType);
-                        oTargetGroup.setLayout(JSON.stringify(oTargetLayout),
-                            resolveMoveBetweenGroups.bind(this, oNewChipInstance), fnFailure);
-                    }, fnFailure, oTile.isStub()); // do not load the tile if first load failed
-                oSourceGroup.removeChipInstance(oTile, resolveMoveBetweenGroups, fnFailure);
-                oSourceGroup.setLayout(JSON.stringify(oSourceLayout), /*fnSuccess*/undefined, fnFailure);
 
-                oPbs.submitBatchQueue(undefined, fnFailure);
+                        // one $batch to add tile to target group, remove old tile, update layout of source group
+                        oActualPageBuildingService.openBatchQueue();
+
+                        var aTargetChipInstances = this.getGroupTiles(oTargetGroup);
+
+                        oTargetGroup.addChipInstance(bIsWrapperOnly ? oTile.getChip() : oTile, function (oNewChipInstance) {
+                            var oCurrentBag, oBagContent;
+                            aTargetChipInstances.splice(iTargetIndex, 0, oNewChipInstance);
+                            // Note: additional requests after the $batch required, because new ID was previously unknown.
+                            // So this requests could not be batched together
+
+                            // Add bags to CHIP instance in target group
+                            aBagIds.forEach(function (sBagId) {
+                                oBagContent = oBagsContents.get(sBagId);
+                                if (oBagContent) {
+                                    oCurrentBag = oNewChipInstance.getBag(sBagId);
+                                    oBagContent.texts.forEach(function (oText) {
+                                        oCurrentBag.setText(oText.name, oText.value);
+                                    });
+                                    oBagContent.properties.forEach(function (oProperty) {
+                                        oCurrentBag.setProperty(oProperty.name, oProperty.value);
+                                    });
+                                    oCurrentBag.save(function () {
+                                        // don't wait for the save operation for performance reasons
+                                    }, function () {
+                                        jQuery.sap.log.error("Bag " + sBagId + ": could not be saved", null, sCOMPONENT);
+                                    });
+                                }
+                            });
+                            // update order of tiles which is stored in the layout property
+                            addToLayout(oTargetLayout, oNewChipInstance.getId(), iTargetIndex, sNewTileType);
+                            oTargetGroup.setLayout(JSON.stringify(oTargetLayout), resolveMoveBetweenGroups.bind(this, oNewChipInstance), fnFailure);
+                        }, fnFailure, oTile.isStub()); // do not load the tile if first load failed
+
+                        oSourceGroup.removeChipInstance(oTile, resolveMoveBetweenGroups, fnFailure);
+                        oSourceGroup.setLayout(JSON.stringify(oSourceLayout), /*fnSuccess*/undefined, fnFailure);
+
+                        oActualPageBuildingService.submitBatchQueue(undefined, fnFailure);
+                    }.bind(this));
             }
+
             return oDeferred.promise();
         };
 
         /**
          * Returns the tile's unique identifier
          *
-         * @param {sap.ui2.srvc.ChipInstance} oTile the tile
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile the tile
          * @returns {string} the id
          * @since 1.11.0
          */
@@ -1953,7 +1954,7 @@ sap.ui.define([
         /**
          * Returns the CHIP's type. This is even possible if the tile is not fully loaded so far.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oChipInstance the CHIP instance
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oChipInstance the CHIP instance
          * @returns {string} the type. either <code>"tile"</code> or <code>"link"</code> or <code>"card"</code>.
          * @since 1.32.0
          */
@@ -1989,7 +1990,7 @@ sap.ui.define([
         /**
          * Returns a promise for the card's manifest. The promise is resolved synchronously.
          *
-         * @param {sap.ui2.srvc.ChipInstance} card the CHIP instance
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} card the CHIP instance
          * @returns {object} The card's manifest
          * @private
          */
@@ -2013,7 +2014,7 @@ sap.ui.define([
         /**
          * Returns the tile's title.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oTile the tile
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile the tile
          * @returns {string} the title, might be <code>undefined</code> if tile has not finished loading (see {@link #getTileView}).
          * @since 1.11.0
          */
@@ -2028,7 +2029,7 @@ sap.ui.define([
          * <br>
          * Note: this function became async since 1.23.0.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oTile The tile's chip data
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile The tile's chip data
          * @returns {object} jQuery.Promise object that is resolved to an instance of sap.m.GenericTile
          * @since 1.11.0
          */
@@ -2096,7 +2097,7 @@ sap.ui.define([
                     // For AppLaunchers, there is an optimization (requested by RT) to call it sync
                     // as the resources are already bundled and loaded at startup.
                     // As a result, the Home will initially at least display app launchers.
-                    sap.ui2.srvc.call(doResolve, doReject, /*async*/!isAppLauncher(oTile));
+                    Utils.callHandler(doResolve, doReject, /*async*/!isAppLauncher(oTile));
                 } else { // failed
                     doReject();
                 }
@@ -2118,7 +2119,7 @@ sap.ui.define([
         /**
          * Returns the tile size in the format <code>1x1</code> or <code>1x2</code>.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oTile the tile
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile the tile
          * @returns {string} the tile size
          * @since 1.11.0
          */
@@ -2132,7 +2133,7 @@ sap.ui.define([
          * Refresh a tile with its latest data.
          * Only dynamic data should be updated, not the tile configuration itself.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oTile the tile
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile the tile
          */
         this.refreshTile = function (oTile) {
             oTile.refresh();
@@ -2241,20 +2242,23 @@ sap.ui.define([
          * but with the advantage of improved responsiveness.
          *
          * @example
-         *   sap.ushell.Container.getService("LaunchPage").getCatalogs()
-         *   .fail(function (sErrorMessage) { // string
-         *     // handle error situation
-         *   })
-         *   .progress(function (oCatalog) { // object
-         *     // do s.th. with single catalog
-         *   })
-         *   .done(function (aCatalogs) { // object[]
-         *     aCatalogs.forEach(function (oCatalog) {
-         *       // do s.th. with single catalog
+         * sap.ushell.Container.getServiceAsync("LaunchPage")
+         *     .then(function (LaunchPageService) {
+         *         LaunchPageService.getCatalogs()
+         *             .fail(function (sErrorMessage) { // string
+         *                 // handle error situation
+         *             })
+         *             .progress(function (oCatalog) { // object
+         *                 // do s.th. with single catalog
+         *             })
+         *             .done(function (aCatalogs) { // object[]
+         *                 aCatalogs.forEach(function (oCatalog) {
+         *                     // do s.th. with single catalog
+         *                 });
+         *             });
          *     });
-         *   });
          *
-         * @returns {object} A <code>jQuery.Deferred</code> object's promise which informs about success or failure
+         * @returns {jQuery.Promise} A jQuery Promise which informs about success or failure
          *   of this asynchronous operation. In case of success, an array of black-box catalog objects is provided (which might be empty).
          *   In case of failure, an error message is passed. Progress notifications are sent for each single catalog,
          *   providing a single black-box catalog object each time.
@@ -2265,146 +2269,182 @@ sap.ui.define([
                 oOldGetCatalogsDeferred = oGetCatalogsDeferred,
                 bRefreshRequired = bCatalogsValid === false;
 
-            /**
-             * Resolves the promise to return the user's catalogs by refreshing the first remote catalog found, failing gracefully.
-             */
-            function refreshRemoteCatalogs () {
-                var iPendingRequests = 0, aWrappedCatalogs = wrapCatalogs();
-
-                aWrappedCatalogs.forEach(function (oWrappedCatalog) {
-                    var oCatalog = oWrappedCatalog.ui2catalog;
-                    // TODO Improve performance: One invalid remote catalog causes refresh of all
-                    if (oCatalog.isStub() || oCatalog.getType() === "H"
-                        || oCatalog.getType() === "REMOTE") {
-                        iPendingRequests += 1;
-                        oCatalog.refresh(function () {
-                            oWrappedCatalog.title = oCatalog.getTitle();
-                            oWrappedCatalog.tiles = wrapAsChipInstances(oCatalog.getChips());
-                            // TODO oRemoteCatalogWrapper.errorMessage once wrappers are cached
+            // Note: bCatalogsValid can be undefined, false, true
+            if (oOldGetCatalogsDeferred && !oOldGetCatalogsDeferred.$notified && !bRefreshRequired) {
+                // re-use existing Deferred object; we cannot miss any notifications!
+                oDeferred = oOldGetCatalogsDeferred;
+            } else {
+                oGetCatalogsDeferred = new jQuery.Deferred();
+                oDeferred = oGetCatalogsDeferred;
+                oDeferred
+                    .done(function () {
+                        if (oDeferred === oGetCatalogsDeferred) {
+                            // only the last call is allowed to change "global" variables
+                            bCatalogsValid = true;
+                        }
+                    })
+                    .always(function () {
+                        if (oDeferred === oGetCatalogsDeferred) {
+                            // only the last call is allowed to change "global" variables
+                            oGetCatalogsDeferred = null;
+                        }
+                    });
 
-                            oDeferred.notify(oWrappedCatalog);
+                if (oOldGetCatalogsDeferred) {
+                    if (bRefreshRequired) {
+                        bCatalogsValid = undefined; // not yet valid, refresh is in progress...
+                    }
+                    // if we cannot reuse the old Deferred object, wait until it is done;
+                    // after invalidation, wait until old operations are complete and then start a new roundtrip
+                    oOldGetCatalogsDeferred
+                        .always(function () {
+                            this._startLoading(oDeferred, bRefreshRequired);
+                        }.bind(this));
+                } else {
+                    this._startLoading(oDeferred, bRefreshRequired);
+                }
+            }
 
-                            iPendingRequests -= 1;
-                            if (iPendingRequests <= 0) {
-                                oDeferred.resolve(aWrappedCatalogs);
-                            }
-                        }, function (sMessage) {
-                            // log errors, but do not fail
-                            jQuery.sap.log.error("Failed to load catalog: " + sMessage,
-                                oCatalog.toString(), sCOMPONENT);
-                            oWrappedCatalog.errorMessage = sMessage || "Error"; // not undefined!
+            return oDeferred.promise();
+        };
+
+        /**
+         * Resolves the promise to return the user's catalogs by refreshing the first remote catalog found, failing gracefully.
+         *
+         * @param {jQuery.Deferred} oDeferred A jQuery.Deferred to be resolved, rejected or notified.
+         * @returns {Promise<sap.ushell.services.PageBuilding>} A promise that is resolved once the PageBuilding service is retrieved.
+         * @private
+         */
+        this._refreshRemoteCatalogs = function (oDeferred) {
+            return sap.ushell.Container.getServiceAsync("PageBuilding")
+                .then(function (PageBuildingService) {
+                    var iPendingRequests = 0;
+                    var oFactory = PageBuildingService.getFactory();
+                    var aWrappedCatalogs = wrapCatalogs(oFactory);
+
+                    aWrappedCatalogs.forEach(function (oWrappedCatalog) {
+                        var oCatalog = oWrappedCatalog.ui2catalog;
+                        // TODO Improve performance: One invalid remote catalog causes refresh of all
+                        if (oCatalog.isStub() || oCatalog.getType() === "H" || oCatalog.getType() === "REMOTE") {
+                            iPendingRequests += 1;
+
+                            oCatalog.refresh(function () {
+                                oWrappedCatalog.title = oCatalog.getTitle();
+                                oWrappedCatalog.tiles = wrapAsChipInstances(oFactory, oCatalog.getChips());
+                                // TODO oRemoteCatalogWrapper.errorMessage once wrappers are cached
+
+                                oDeferred.notify(oWrappedCatalog);
+
+                                iPendingRequests -= 1;
+                                if (iPendingRequests <= 0) {
+                                    oDeferred.resolve(aWrappedCatalogs);
+                                }
+                            }, function (sMessage) {
+                                // log errors, but do not fail
+                                jQuery.sap.log.error("Failed to load catalog: " + sMessage, oCatalog.toString(), sCOMPONENT);
+                                oWrappedCatalog.errorMessage = sMessage || "Error"; // not undefined!
 
+                                oDeferred.notify(oWrappedCatalog);
+
+                                iPendingRequests -= 1;
+                                if (iPendingRequests <= 0) {
+                                    oDeferred.resolve(aWrappedCatalogs);
+                                }
+                            });
+                        } else {
                             oDeferred.notify(oWrappedCatalog);
+                            oDeferred.$notified = true; // notifications have already been sent
+                        }
+                    });
 
-                            iPendingRequests -= 1;
-                            if (iPendingRequests <= 0) {
-                                oDeferred.resolve(aWrappedCatalogs);
-                            }
-                        });
-                    } else {
-                        oDeferred.notify(oWrappedCatalog);
-                        oDeferred.$notified = true; // notifications have already been sent
+                    if (iPendingRequests <= 0) {
+                        oDeferred.resolve(aWrappedCatalogs);
                     }
                 });
+        };
 
-                if (iPendingRequests <= 0) {
-                    oDeferred.resolve(aWrappedCatalogs);
-                }
-            }
+        /**
+         * Resolves the promise to return the user's catalogs...by just knowing them already.
+         *
+         * @param {jQuery.Deferred} oDeferred A jQuery.Deferred to be resolved, rejected or notified.
+         * @returns {Promise<sap.ushell.services.PageBuilding>} A promise that is resolved once the PageBuilding service is retrieved.
+         * @private
+         */
+        this._useKnownCatalogs = function (oDeferred) {
+            return sap.ushell.Container.getServiceAsync("PageBuilding")
+                .then(function (PageBuildingService) {
+                    var aWrappedCatalogs = wrapCatalogs(PageBuildingService.getFactory());
 
-            /**
-             * Resolves the promise to return the user's catalogs...by just knowing them already.
-             */
-            function useKnownCatalogs () {
-                var aWrappedCatalogs = wrapCatalogs();
+                    aWrappedCatalogs.forEach(function (oWrappedCatalog) {
+                        oDeferred.notify(oWrappedCatalog);
+                    });
 
-                aWrappedCatalogs.forEach(function (oWrappedCatalog) {
-                    oDeferred.notify(oWrappedCatalog);
+                    oDeferred.resolve(aWrappedCatalogs);
                 });
+        };
 
-                oDeferred.resolve(aWrappedCatalogs);
-            }
+        /**
+         * Resolves the promise to return the user's catalogs either by loading them, refreshing them, or just knowing them already.
+         *
+         * @param {jQuery.Deferred} oDeferred A jQuery.Deferred to be resolved, rejected or notified.
+         * @param {boolean} bRefreshRequired Whether or not the catalogs should be loaded again.
+         * @private
+         */
+        this._doGetCatalogs = function (oDeferred, bRefreshRequired) {
+            var oAllCatalogs = this._oCurrentPageSet.getDefaultPage().getAllCatalogs();
 
-            /**
-             * Resolves the promise to return the user's catalogs either by loading them, refreshing them, or just knowing them already.
-             *
-             * @param {boolean} bSynchronous whether this method is called synchronous to the original <code>this.getCatalogs()</code> call.
-             */
-            function doGetCatalogs (bSynchronous) {
-                var oAllCatalogs = that._oCurrentPageSet.getDefaultPage().getAllCatalogs();
-
-                if (oAllCatalogs.isStub()) {
-                    oAllCatalogs.load(refreshRemoteCatalogs, oDeferred.reject.bind(oDeferred),
-                        "type eq 'CATALOG_PAGE' or type eq 'H' or type eq 'SM_CATALOG'" +
-                        " or type eq 'REMOTE'",
-                        /*bPartially*/true, /*sorting field*/ "title", /*useCache*/ true);
-                } else {
-                    // Make sure that oDeferred is not notified _before_ progress handler has been registered!
-                    // Delay calls in case we are still synchronous!
-                    sap.ui2.srvc.call(
-                        bRefreshRequired ? refreshRemoteCatalogs : useKnownCatalogs,
-                        oDeferred.reject.bind(oDeferred),
-                        bSynchronous // = bAsync
-                    );
-                }
+            if (oAllCatalogs.isStub()) {
+                oAllCatalogs.load(function () {
+                    this._refreshRemoteCatalogs(oDeferred);
+                }.bind(this), oDeferred.reject, "type eq 'CATALOG_PAGE' or type eq 'H' or type eq 'SM_CATALOG' or type eq 'REMOTE'", true, "title", true);
+            } else if (bRefreshRequired) {
+                this._refreshRemoteCatalogs(oDeferred);
+            } else {
+                this._useKnownCatalogs(oDeferred);
             }
+        };
 
-            /**
-             * Starts loading of catalogs, after parallel calls and invalidation have been taken care of.
-             *
-             * @param {boolean} bSynchronous whether this method is called synchronous to the original <code>this.getCatalogs()</code> call.
-             */
-            function startLoading (bSynchronous) {
-                if (oTargetMappingServiceConfig && oTargetMappingServiceConfig.cacheId) {
-                    // add cache buster token for the allCatalogs request.
-                    // Reuse TargetMappings token as it is also invalidated in case the user's catalogs changed
-                    var oCacheTokens = sap.ushell.Container.getService("PageBuilding").getFactory().getPageBuildingService()
-                        .readAllCatalogs.cacheBusterTokens;
-                    oCacheTokens.put(sDEFAULT_PAGE_ID, oTargetMappingServiceConfig.cacheId);
-                    if (Config.last("/core/spaces/enabled")) {
-                        oCacheTokens.put(PAGE_ID_WITHOUT_TM, oTargetMappingServiceConfig.cacheId);
-                    }
-                }
+        /**
+         * Starts loading of catalogs, after parallel calls and invalidation have been taken care of.
+         *
+         * @param {jQuery.Deferred} oDeferred A jQuery.Deferred to be resolved, rejected or notified.
+         * @param {boolean} bRefreshRequired Whether or not the catalogs should be loaded again.
+         * @private
+         */
+        this._startLoading = function (oDeferred, bRefreshRequired) {
+            var oPromise;
 
-                if (that._bPageSetFullyLoaded) {
-                    doGetCatalogs(bSynchronous);
-                } else {
-                    // call getGroups because it is the entry point of the LPA
-                    that.getGroups().done(doGetCatalogs).fail(oDeferred.reject.bind(oDeferred));
-                }
-            }
+            if (oTargetMappingServiceConfig && oTargetMappingServiceConfig.cacheId) {
+                // add cache buster token for the allCatalogs request.
+                // Reuse TargetMappings token as it is also invalidated in case the user's catalogs changed
+                oPromise = sap.ushell.Container.getServiceAsync("PageBuilding")
+                    .then(function (PageBuildingService) {
+                        var oCacheTokens = PageBuildingService.getFactory().getPageBuildingService().readAllCatalogs.cacheBusterTokens;
 
-            // Note: bCatalogsValid can be undefined, false, true
-            if (oGetCatalogsDeferred && !oGetCatalogsDeferred.$notified && !bRefreshRequired) {
-                // re-use existing Deferred object; we cannot miss any notifications!
-                oDeferred = oGetCatalogsDeferred;
-            } else {
-                oDeferred = oGetCatalogsDeferred = new jQuery.Deferred();
-                oDeferred.done(function () {
-                    if (oDeferred === oGetCatalogsDeferred) {
-                        // only the last call is allowed to change "global" variables
-                        bCatalogsValid = true;
-                    }
-                }).always(function () {
-                    if (oDeferred === oGetCatalogsDeferred) {
-                        // only the last call is allowed to change "global" variables
-                        oGetCatalogsDeferred = null;
-                    }
-                });
+                        oCacheTokens.put(sDEFAULT_PAGE_ID, oTargetMappingServiceConfig.cacheId);
 
-                if (oOldGetCatalogsDeferred) {
-                    if (bRefreshRequired) {
-                        bCatalogsValid = undefined; // not yet valid, refresh is in progress...
-                    }
-                    // if we cannot reuse the old Deferred object, wait until it is done;
-                    // after invalidation, wait until old operations are complete and then start a new roundtrip
-                    oOldGetCatalogsDeferred.always(startLoading);
-                } else {
-                    startLoading(true);
-                }
+                        if (Config.last("/core/spaces/enabled")) {
+                            oCacheTokens.put(PAGE_ID_WITHOUT_TM, oTargetMappingServiceConfig.cacheId);
+                        }
+                    })
+                    .catch(oDeferred.reject);
+            } else {
+                oPromise = Promise.resolve();
             }
 
-            return oDeferred.promise();
+            oPromise
+                .then(function () {
+                    if (that._bPageSetFullyLoaded) {
+                        this._doGetCatalogs(oDeferred, bRefreshRequired);
+                    } else {
+                        this.getGroups()
+                            .done(function () {
+                                this._doGetCatalogs(oDeferred, bRefreshRequired);
+                            }.bind(this))
+                            .fail(oDeferred.reject);
+                    }
+                }.bind(this))
+                .catch(oDeferred.reject);
         };
 
         /**
@@ -2475,7 +2515,7 @@ sap.ui.define([
 
         /**
          * Returns the catalog's tiles. This is an asynchronous function using a jQuery.Promise.
-         * In case of success its <code>done</code> function is called and gets the tiles as array of <code>sap.ui2.srvc.Chip</code>.
+         * In case of success its <code>done</code> function is called and gets the tiles as array of <code>sap.ushell_abap.pbServices.ui2.Chip</code>.
          * In case of error the promise's <code>fail</code> function is called.
          *
          * @param {object} oConfigCatalog the catalog
@@ -2686,7 +2726,7 @@ sap.ui.define([
                 sCatalogDescription = oCatalogTile.getChip().getDescription();
 
             function addKeywords (oKeywordsSet, aKeywordsList) {
-                if (sap.ui2.srvc.isArray(aKeywordsList)) {
+                if (Utils.isArray(aKeywordsList)) {
                     aKeywordsList.forEach(function (sKeyword) {
                         if (oKeywordsSet.hasOwnProperty(sKeyword)) {
                             return;
@@ -2700,7 +2740,7 @@ sap.ui.define([
             function getKeywordsDefinedInCatalogTileData (oCatalogTile) {
                 var sKeywordsText = LaunchPageAdapter.prototype._getBagText(oCatalogTile, "tileProperties", "display_search_keywords");
 
-                if (!sap.ui2.srvc.isString(sKeywordsText) || sKeywordsText === "") {
+                if (!Utils.isString(sKeywordsText) || sKeywordsText === "") {
                     return [];
                 }
 
@@ -2824,7 +2864,7 @@ sap.ui.define([
                 oConfiguration.service_refresh_interval = oParameters.serviceRefreshInterval || 0;
                 oConfiguration.service_url = oParameters.serviceUrl;
             }
-            if (oGroup && !(oGroup instanceof sap.ui2.srvc.Page)) {
+            if (oGroup && !(oGroup instanceof Page)) {
                 // same behavior like addCatalogTileToGroup of the Bookmark service:
                 // if the group is unknown don't use the default group but reject.
                 oDeferred.reject("The given object is not a group");
@@ -2885,7 +2925,7 @@ sap.ui.define([
             var oChipConfig = oBookmarkConfig.vizConfig["sap.flp"].chipConfig;
             var oDeferred = new jQuery.Deferred();
 
-            if (oGroup && !(oGroup instanceof sap.ui2.srvc.Page)) {
+            if (oGroup && !(oGroup instanceof Page)) {
                 // same behavior like addCatalogTileToGroup of the Bookmark service:
                 // if the group is unknown don't use the default group but reject.
                 oDeferred.reject("The given object is not a group");
@@ -3104,7 +3144,7 @@ sap.ui.define([
         /**
          * Tells whether the given CHIP instance represents a bookmark matching the given identifier.
          *
-         * @param {sap.ui2.srvc.ChipInstance} oChipInstance
+         * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oChipInstance
          * @param {string | object} vIdentifier the url as string or an identifier object
          * @returns {boolean}
          * @see #addBookmark
@@ -3130,7 +3170,7 @@ sap.ui.define([
          * This is a potentially asynchronous operation in case the user's groups have not yet been loaded completely!
          *
          * @param {string} sUrl The URL of the bookmarks to be visited, exactly as specified to {@link #addBookmark}.
-         * @param {function(sap.ui2.srvc.ChipInstance)} [fnVisitor] The asynchronous visitor function returning a
+         * @param {function(sap.ushell_abap.pbServices.ui2.ChipInstance)} [fnVisitor] The asynchronous visitor function returning a
          *   <code>jQuery.Deferred</code> object's promise.
          *   In case of success, no details are expected. In case of failure, an error message is passed.
          * @returns {object} A <code>jQuery.Deferred</code> object's promise which informs about success or failure
@@ -3533,7 +3573,7 @@ sap.ui.define([
             .then(function (oPageBuildingService) {
                 var oUI2PageBuildingService = oPageBuildingService.getFactory().getPageBuildingService();
                 return new Promise(function (resolve, reject) {
-                    // There is no good way to access the raw data as it is normalized and well hidden in closures in sap.ui2.srvc
+                    // There is no good way to access the raw data as it is normalized and well hidden in closures in sap.ushell_abap.pbServices.ui2
                     // Therefore we trigger the allCatalogs request again which reads from the cache of the OData wrapper
                     oUI2PageBuildingService.readAllCatalogs(PAGE_ID_WITHOUT_TM, resolve, reject,
                         "type eq 'CATALOG_PAGE' or type eq 'H' or type eq 'SM_CATALOG' or type eq 'REMOTE'", "title", true);