Hotfix mar31 (#2480)

smahati · danjoa · web-flow · commit e57914f868e1 · 2026-03-31T15:30:25.000+02:00
Co-authored-by: Daniel Hutzel &lt;daniel.hutzel@sap.com&gt;
diff --git a/guides/integration/data-federation.md b/guides/integration/data-federation.md
@@ -77,10 +77,10 @@ Relying on live calls to remote services per row is clearly not an option. Inste
 
 We'll use the same [XTravels sample](calesi.md#the-xtravels-sample) and setup as in the [_CAP-level Service Integration_](calesi.md) guide. If you haven't done so already, clone the required repositories to follow along:
 
-```sh
+```sh :line-numbers
 mkdir -p cap/samples
 cd cap/samples
-git clone https://github.com/capire/xtravels
+git clone https://github.com/capire/xtravels 
 git clone https://github.com/capire/xflights
 git clone https://github.com/capire/s4
 ```
@@ -89,6 +89,14 @@ git clone https://github.com/capire/s4
 [@capire/xflights]: https://github.com/capire/xflights
 [@capire/s4]: https://github.com/capire/s4
 
+```sh :line-numbers=6
+echo '{"workspaces":["xflights","xtravels","s4"]}' > package.json
+npm install
+```
+
+> [!note]
+> Line 6 above turns the `cap/samples` folder into a root for `npm workspaces` to optimize the `npm install` locally. 
+> We'll learn more about that in the [_Inner Loop Development guide_](inner-loops.md). 
 
 
 
@@ -180,15 +188,27 @@ Let's have a closer look at this code, which handles these main tasks:
 
 ## Test Drive Locally
 
-Let's see the outcome in action: to activate the above data federation code, edit `srv/server.js` file and uncomment the single line of code in there like this:
+Let's see the outcome in action: to activate the above data federation code, edit `xtravels/srv/server.js` file and uncomment the single line of code in there like this:
 
 ::: code-group
-```js :line-numbers [srv/server.js]
+```js [srv/server.js]
 process.env.NODE_ENV || require ('./data-federation')
 ```
 :::
 
-Restart the Xtravels app, and see these lines in the log output:
+With that in place, we can start the xtravels app again, and see the data federation in action. Do so by running the following commands from within the `cap/samples` root folder in separate terminals, and in that order:
+
+```shell :line-numbers=1
+cds watch s4
+```
+```shell :line-numbers=2
+cds watch xflights
+```
+```shell :line-numbers=3
+cds watch xtravels
+```
+
+In the logs of the xtravels app server, you should now see the output of the replication handler, showing that entries from the remote services are replicated locally:
 
 ```zsh
 Replicated 49 entries { for: 'sap.capire.xflights.Supplements', via: 'hcql' }
diff --git a/guides/integration/inner-loops.md b/guides/integration/inner-loops.md
@@ -32,26 +32,39 @@ Here's a very rough comparison from a real world example:
 
 ### The XTravels Sample
 
-We'll use the same [XTravels sample](calesi.md#the-xtravels-sample) and setup as in the [_CAP-level Service Integration_](calesi.md) guide. If you haven't done so already, clone the required repositories to follow along:
+We'll use the same [XTravels sample](calesi.md#the-xtravels-sample) and setup as described in the [_CAP-level Service Integration_](calesi.md) guide. If you haven't done so already, clone the required repositories to follow along:
 
 ```sh :line-numbers
 mkdir -p cap/samples
 cd cap/samples
 git clone https://github.com/capire/xtravels 
 git clone https://github.com/capire/xflights
 git clone https://github.com/capire/s4
-echo '{"workspaces":["xflights","xtravels","s4"]}' > package.json
-npm install
 ```
 
 [@capire/xtravels]: https://github.com/capire/xtravels
 [@capire/xflights]: https://github.com/capire/xflights
 [@capire/s4]: https://github.com/capire/s4
 
+```sh :line-numbers=6
+echo '{"workspaces":["xflights","xtravels","s4"]}' > package.json
+npm install
+```
+
 > [!note]
 >
 > Line 6 above turns the `cap/samples` folder into a root for `npm workspaces`. For the time being this simply optimizes the `npm install`. We'll revisit that in chapter [*Using `npm` Workspaces*](#using-npm-workspaces) below. 
 
+#### Activate Generic Data Federation
+
+In addition, activate generic data federation as described in the [_CAP-level Data Federation_](data-federation.md) guide, by editing `xtravels/srv/server.js` file and uncommenting the single line of code in there like this:
+
+::: code-group
+```js [xtravels/srv/server.js]
+process.env.NODE_ENV || require ('./data-federation')
+```
+:::
+
 
 
 ## Mocked Out of the Box
@@ -166,12 +179,12 @@ For Java, make sure to add the `--with-mocks` option to the `cds deploy` command
 
 ## Run with Real Services 
 
-Instead of mocking required services by the imported APIs [using `cds mock` as shown above](#cds-mock), we can also run the real *xflights* service from its respective home folder which we [cloned already in the beginning](#the-xtravels-sample). We can combine that with `s4` still mocked from the imported API, as above.
+Instead of mocking required services by the imported APIs [using `cds mock` as shown above](#cds-mock), we can also run the real *xflights* and *s4* services from their respective home folders which we [cloned already in the beginning](#the-xtravels-sample). 
 
 Do so by running the following commands from within the `cap/samples` root folder in separate terminals, and in that order:
 
 ```shell :line-numbers=1
-cd xtravels; cds mock apis/capire/s4.cds
+cds watch s4
 ```
 ```shell :line-numbers=2
 cds watch xflights
@@ -200,10 +213,10 @@ In the log output of the xtravels server we should see that it _connects_ to the
 
 We can use `cds repl` to experiment the options to send requests and queries to remote services interactively. Do so as follows...
 
-From within the xtravels project's root folder `cap/samples/xtravels`, start by mocking the remote services in separate terminals, then start xtravels server within `cds repl` (instead of `cds watch`) in a third terminal:
+From within the xtravels project's root folder `cap/samples/xtravels`, start by again running the remote services in separate terminals, then start xtravels server again in a third terminal, this time within `cds repl` instead of `cds watch`:
 
 ```shell :line-numbers=1
-cd xtravels; cds mock apis/capire/s4.cds
+cds watch s4
 ```
 
 ```shell :line-numbers=2
