Remove workaround for authorization glitch

2020-11-21 01:35:24 +01:00
64 changed files with 552 additions and 957 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -21,7 +21,6 @@
    },
    "rules": {
        "no-console": "off",
-        "require-atomic-updates": "off",
+        "require-atomic-updates": "off"
        "require-await":"warn"
    }
 }
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -16,7 +16,7 @@ jobs:
    strategy:
      matrix:
-        node-version: [12.x, 14.x]
+        node-version: [10.x, 12.x, 14.x]
    steps:
    - uses: actions/checkout@v2
--- a/.registry/.gitignore
+++ b/.registry/.gitignore
@@ -1 +0,0 @@
 *.tgz
--- a/.registry/server.js
+++ b/.registry/server.js
@@ -5,9 +5,9 @@ const app = express()
 const { PORT=4444 } = process.env
 const [,,port=PORT] = process.argv
 process.chdir(__dirname)
 app.use('/-/:tarball', (req,res,next) => {
  const url = decodeURIComponent(req.url)
  console.debug ('GET', req.params)
  try {
    const { tarball } = req.params
--- a/.tours/db-native.tour
+++ b/.tours/db-native.tour
@@ -1,109 +0,0 @@
 {
  "$schema": "https://aka.ms/codetour-schema",
  "title": "Database Functions",
  "steps": [
    {
      "title": "Introduction",
      "description": "### Database Functions in CDS Models\n\nIn this tour, you'll learn how to add database-specific functions to CDS models in your application."
    },
    {
      "file": "bookshop/db/schema.cds",
      "description": "#### Basic Schema\n\nWe want to add two fields to the `Authors` entity, one for the author's age and one for the span of years that she or he lived.\n\nThese two fields can be computed out of the existing `dateOfBirth` and `dateOfDeath` fields.",
      "selection": {
        "start": {
          "line": 19,
          "character": 1
        },
        "end": {
          "line": 21,
          "character": 1
        }
      },
      "title": "Base fields in Author"
    },
    {
      "file": "bookshop/srv/admin-service.cds",
      "description": "This is how the `Authors` entity gets exposed in an OData or REST service.\n\nIn the next step, you'll see how we extend this projection.",
      "selection": {
        "start": {
          "line": 4,
          "character": 1
        },
        "end": {
          "line": 5,
          "character": 1
        }
      },
      "title": "Authors service"
    },
    {
      "file": "fiori/db/sqlite/index.cds",
      "description": "#### SQLite Implementation\n\nHere's the first implementation for SQLite.  It computes the two fields `age` and `lifetime` through SQLite's [strftime](https://sqlite.org/lang_datefunc.html) function.\n\nThrough the [`extend projection`](https://cap.cloud.sap/docs/cds/cdl#extend-view) clause you can add additional fields to projection entities.  These are deployed as database views, which is why we can integrate the database functions in the first place.\n",
      "selection": {
        "start": {
          "line": 7,
          "character": 1
        },
        "end": {
          "line": 11,
          "character": 1
        }
      },
      "title": "SQLite implementation"
    },
    {
      "file": "fiori/db/hana/index.cds",
      "description": "#### SAP HANA Implementation\n\nThis is the second implementation for SAP HANA.  It computes the same two fields `age` and `lifetime` through the [YEARS_BETWEEN](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/7c0d2c161ea34def86de3f5eadd6a0af.html) and [YEAR](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/20f5fac6751910148dabd3c6821f907d.html) functions of SAP HANA.\n\n#### File Layout and Code Structure\n\nNote the path of the `.cds` file we are in: it's in a subfolder of `db`, so that it's _not_ automatically picked up when we start the application.  The same is true for the SQLite implementation: it's in a separate `db/sqlite/` folder as well.  In the next step, you'll see how these files are loaded.\n\nAlso, we choose to implement all of that as an extension of the original bookshop here in the _fiori_ package.  See the first [CAP Samples] code tour for more details on the different packages of this repository.",
      "selection": {
        "start": {
          "line": 7,
          "character": 1
        },
        "end": {
          "line": 11,
          "character": 1
        }
      },
      "title": "SAP HANA implementation"
    },
    {
      "file": "fiori/package.json",
      "description": "#### Configuration\n\nThe `cds` section in `package.json` is a place to configure which of the `db/sqlite` and `db/hana` folders are used for which database.\nWe use [Node.js profiles](https://cap.cloud.sap/docs/node.js/cds-env#profiles) to separate the configuration.\nIn the `development` profile, you can see that `db/sqlite` is set as the model, while the `db/hana` folder is configured in the `production` profile.",
      "line": 17,
      "title": "Configuration"
    },
    {
      "file": "fiori/package.json",
      "description": "#### Run with SQLite\n\nTo run with `development` and an in-memory SQLite database, you don't need to do anything special, because it's activated by default.  Just run:\n\n>> cds watch fiori\n\nThen open [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) to see the two new fields.\n",
      "line": 28,
      "title": "Run with SQLite"
    },
    {
      "file": "fiori/package.json",
      "description": "#### Deploy the CDS Model to SAP HANA\n\nTo 'activate' SAP HANA through the `production` profile, you can use the global `--production` flag:\n\n>> cd fiori; cds deploy --to hana --production\n\n[Learn more about SAP HANA deployment](https://cap.cloud.sap/docs/guides/databases#get-hana)\n\n#### Run the Application\n\n>> cd fiori; cds watch --production\n\nThe service on [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) is the same as before, but this time the `Authors` entity is backed by a database view with an SAP HANA function.\n\n#### More\n\nIf you don't see data, you can add some in the next step.",
      "line": 31,
      "title": "Run with SAP HANA"
    },
    {
      "file": "fiori/test/requests.http",
      "description": "### Add More Data\n\nOptionally you can add some `Authors` data by clicking on the _Send Request_ link (provided by the [REST client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension).",
      "line": 68,
      "selection": {
        "start": {
          "line": 67,
          "character": 1
        },
        "end": {
          "line": 73,
          "character": 1
        }
      },
      "title": "Add Data"
    },
    {
      "title": "Wrap-up",
      "description": "### Summary\n\nThat's it!  You have seen: \n- How to integrate database-specific functions in a CDS model.\n- How to switch between the two implementations for SQLite and SAP HANA."
    }
  ],
  "ref": "master"
 }
--- a/.tours/samples.tour
+++ b/.tours/samples.tour
@@ -1,136 +0,0 @@
 {
  "$schema": "https://aka.ms/codetour-schema",
  "title": "CAP Samples",
  "steps": [
    {
      "title": "Welcome",
      "file": "README.md",
      "description": "### Welcome to CAP Samples!\n\nThis tour leads you through a collection of samples for the [SAP Cloud Application Programming Model (CAP)](https://cap.cloud.sap).\nYou will learn which features of the programming model are demonstrated in which sample.\n\nLet's start!",
      "line": 2,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 3,
          "character": 108
        }
      }
    },
    {
      "file": "hello/world.cds",
      "description": "### Hello World!\n\nThis is a simplistic [Hello World](https://cap.cloud.sap/docs/get-started/hello-world) service using [CDS](https://cap.cloud.sap/docs/cds/) and [cds.services](https://cap.cloud.sap/docs/node.js/api#services-api).",
      "line": 2,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 4,
          "character": 1
        }
      },
      "title": "Hello World!"
    },
    {
      "file": "bookshop/db/schema.cds",
      "description": "### A Bookshop!\n\nIntroduces:\n- [Project Setup](https://cap.cloud.sap/docs/get-started/) and [Layouts](https://cap.cloud.sap/docs/get-started/projects)\n- [Domain Modeling](https://cap.cloud.sap/docs/guides/domain-models)\n- [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)\n- [Generic Providers](https://cap.cloud.sap/docs/guides/generic-providers)\n- [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)\n- [Using Databases](https://cap.cloud.sap/docs/guides/databases)\n",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 32,
          "character": 1
        }
      },
      "title": "Bookshop"
    },
    {
      "file": "common/index.cds",
      "description": "### Extend and Reuse\n\nShowcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering:\n- Building [extension packages](https://cap.cloud.sap/docs/guides/domain-models#aspects-extensibility)\n- Providing [reuse packages](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)\n- [Verticalization](https://cap.cloud.sap/docs/cds/common#adapting-to-your-needs)\n- Using [Aspects](https://cap.cloud.sap/docs/cds/cdl#aspects)\n- Used in the [fiori app sample](#fiori)\n",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 46,
          "character": 1
        }
      },
      "title": "Common"
    },
    {
      "file": "orders/db/schema.cds",
      "description": "### Compositions and Serving Documents\n\nA standalone orders management service, demonstrating:\n- Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with\n- [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)\n",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 27,
          "character": 1
        }
      },
      "title": "Orders"
    },
    {
      "file": "reviews/db/schema.cds",
      "description": "### More Modularity\n\nShows how to implement a modular service to manage product reviews, including:\n- Consuming other services synchronously and asynchronously\n- Serving requests synchronously\n- Emitting events asynchronously\n- Grow as you go, with:\n- Mocking app services\n- Running service meshes\n- Late-cut Micro Services\n- As well as managed data, input validations, and authorization\n",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 39,
          "character": 1
        }
      },
      "title": "Reviews"
    },
    {
      "file": "fiori/app/index.cds",
      "description": "### Annotations for SAP Fiori Elements\n\nA [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:\n  - [@capire/bookshop](bookshop)\n  - [@capire/reviews](reviews)\n  - [@capire/orders](orders)\n  - [@capire/common](common)\n\n[Adds a SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:\n  - [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files\n  - Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)\n  - Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)\n  - Serving SAP Fiori apps locally\n\n[The Vue.js app](bookshop/app/vue) imported from bookshop is served as well.\n",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 13,
          "character": 1
        }
      },
      "title": "Fiori"
    },
    {
      "file": "package.json",
      "description": "### All-in-one Monorepo\n\nEach sample sub directory essentially is a standard npm package, some with standard npm dependencies to other samples. The root folder's [package.json](package.json) has local links to the sub folders, such that an `npm install` populates a local `node_modules` folder acts like a local npm registry to the individual sample packages.\n",
      "line": 8,
      "selection": {
        "start": {
          "line": 8,
          "character": 1
        },
        "end": {
          "line": 15,
          "character": 1
        }
      },
      "title": "Packages"
    }
  ],
  "isPrimary": true,
  "description": "Overview of CAP Samples for Node.js"
 }
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -4,15 +4,14 @@
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
-		"sapse.vscode-cds",
+		"SAPSE.vscode-cds",
 		"dbaeumer.vscode-eslint",
 		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"humao.rest-client",
 		"alexcvzz.vscode-sqlite",
 		"hbenl.vscode-mocha-test-adapter",
-		"sdras.night-owl",
+		"sdras.night-owl"
 		"vsls-contrib.codetour"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,31 +4,28 @@
  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
  "version": "0.2.0",
  "configurations": [
  {
    "name": "Attach by Process ID",
    "processId": "${command:PickProcess}",
    "request": "attach",
    "skipFiles": [
      "<node_internals>/**"
    ],
    "type": "pwa-node"
  },
    {
      "name": "bookshop",
-      "command": "npx cds watch bookshop",
+      "command": "cds watch bookshop",
      "type": "node-terminal",
      "request": "launch",
-      "skipFiles": [
+      "type": "node-terminal",
-        "<node_internals>/**",
+      "skipFiles": ["<node_internals>/**"]
        "**/node_modules/**",
        "**/cds/lib/lazy.js",
        "**/cds/lib/req/cls.js",
        "**/odata-v4/okra/**"
      ]
    },
    {
-      "name": "Fiori App",
+      "name": "Fiori app",
-      "command": "npx cds watch fiori",
+      "command": "cds watch fiori",
      "type": "node-terminal",
      "request": "launch",
-      "skipFiles": [
+      "type": "node-terminal",
-        "<node_internals>/**",
+      "skipFiles": ["<node_internals>/**"]
        "**/node_modules/**",
        "**/cds/lib/lazy.js",
        "**/cds/lib/req/cls.js",
        "**/odata-v4/okra/**"
      ]
    }
  ],
  "inputs": [
@@ -36,7 +33,7 @@
      "type": "pickString",
      "id": "sample",
      "description": "Which sample do you want to start?",
-      "options": [ "bookshop", "fiori", "reviews", "reviews" ],
+      "options": ["bookshop", "fiori", "reviews", "reviews/test/bookshop"],
      "default": "bookshop"
    }
  ]
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,17 +1,6 @@
 {
  "files.exclude": {
    ".reuse/**": true,
    "**/.gitignore": true,
-    "**/.vscode": true,
+    "**/.vscode": true
-    "LICENSES/**": true
+  }
  },
  "debug.javascript.terminalOptions": {
    "skipFiles": [
      "<node_internals>/**",
      "**/node_modules/**",
      "**/cds/lib/lazy.js",
      "**/cds/lib/req/cls.js",
      "**/odata-v4/okra/**"
    ]
  },
 }
--- a/208
+++ b/208
@@ -0,0 +1,208 @@
 Apache License
 Version 2.0, January 2004
 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION,
 AND DISTRIBUTION
   1. Definitions.
 "License" shall mean the terms and conditions for use, reproduction, and distribution
 as defined by Sections 1 through 9 of this document.
 "Licensor" shall mean the copyright owner or entity authorized by the copyright
 owner that is granting the License.
 "Legal Entity" shall mean the union of the acting entity and all other entities
 that control, are controlled by, or are under common control with that entity.
 For the purposes of this definition, "control" means (i) the power, direct
 or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (ii) ownership of fifty percent (50%) or more
 of the outstanding shares, or (iii) beneficial ownership of such entity.
 "You" (or "Your") shall mean an individual or Legal Entity exercising permissions
 granted by this License.
 "Source" form shall mean the preferred form for making modifications, including
 but not limited to software source code, documentation source, and configuration
 files.
 "Object" form shall mean any form resulting from mechanical transformation
 or translation of a Source form, including but not limited to compiled object
 code, generated documentation, and conversions to other media types.
 "Work" shall mean the work of authorship, whether in Source or Object form,
 made available under the License, as indicated by a copyright notice that
 is included in or attached to the work (an example is provided in the Appendix
 below).
 "Derivative Works" shall mean any work, whether in Source or Object form,
 that is based on (or derived from) the Work and for which the editorial revisions,
 annotations, elaborations, or other modifications represent, as a whole, an
 original work of authorship. For the purposes of this License, Derivative
 Works shall not include works that remain separable from, or merely link (or
 bind by name) to the interfaces of, the Work and Derivative Works thereof.
 "Contribution" shall mean any work of authorship, including the original version
 of the Work and any modifications or additions to that Work or Derivative
 Works thereof, that is intentionally submitted to Licensor for inclusion in
 the Work by the copyright owner or by an individual or Legal Entity authorized
 to submit on behalf of the copyright owner. For the purposes of this definition,
 "submitted" means any form of electronic, verbal, or written communication
 sent to the Licensor or its representatives, including but not limited to
 communication on electronic mailing lists, source code control systems, and
 issue tracking systems that are managed by, or on behalf of, the Licensor
 for the purpose of discussing and improving the Work, but excluding communication
 that is conspicuously marked or otherwise designated in writing by the copyright
 owner as "Not a Contribution."
 "Contributor" shall mean Licensor and any individual or Legal Entity on behalf
 of whom a Contribution has been received by Licensor and subsequently incorporated
 within the Work.
 2. Grant of Copyright License. Subject to the terms and conditions of this
 License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
 no-charge, royalty-free, irrevocable copyright license to reproduce, prepare
 Derivative Works of, publicly display, publicly perform, sublicense, and distribute
 the Work and such Derivative Works in Source or Object form.
 3. Grant of Patent License. Subject to the terms and conditions of this License,
 each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
 no-charge, royalty-free, irrevocable (except as stated in this section) patent
 license to make, have made, use, offer to sell, sell, import, and otherwise
 transfer the Work, where such license applies only to those patent claims
 licensable by such Contributor that are necessarily infringed by their Contribution(s)
 alone or by combination of their Contribution(s) with the Work to which such
 Contribution(s) was submitted. If You institute patent litigation against
 any entity (including a cross-claim or counterclaim in a lawsuit) alleging
 that the Work or a Contribution incorporated within the Work constitutes direct
 or contributory patent infringement, then any patent licenses granted to You
 under this License for that Work shall terminate as of the date such litigation
 is filed.
 4. Redistribution. You may reproduce and distribute copies of the Work or
 Derivative Works thereof in any medium, with or without modifications, and
 in Source or Object form, provided that You meet the following conditions:
 (a) You must give any other recipients of the Work or Derivative Works a copy
 of this License; and
 (b) You must cause any modified files to carry prominent notices stating that
 You changed the files; and
 (c) You must retain, in the Source form of any Derivative Works that You distribute,
 all copyright, patent, trademark, and attribution notices from the Source
 form of the Work, excluding those notices that do not pertain to any part
 of the Derivative Works; and
 (d) If the Work includes a "NOTICE" text file as part of its distribution,
 then any Derivative Works that You distribute must include a readable copy
 of the attribution notices contained within such NOTICE file, excluding those
 notices that do not pertain to any part of the Derivative Works, in at least
 one of the following places: within a NOTICE text file distributed as part
 of the Derivative Works; within the Source form or documentation, if provided
 along with the Derivative Works; or, within a display generated by the Derivative
 Works, if and wherever such third-party notices normally appear. The contents
 of the NOTICE file are for informational purposes only and do not modify the
 License. You may add Your own attribution notices within Derivative Works
 that You distribute, alongside or as an addendum to the NOTICE text from the
 Work, provided that such additional attribution notices cannot be construed
 as modifying the License.
 You may add Your own copyright statement to Your modifications and may provide
 additional or different license terms and conditions for use, reproduction,
 or distribution of Your modifications, or for any such Derivative Works as
 a whole, provided Your use, reproduction, and distribution of the Work otherwise
 complies with the conditions stated in this License.
 5. Submission of Contributions. Unless You explicitly state otherwise, any
 Contribution intentionally submitted for inclusion in the Work by You to the
 Licensor shall be under the terms and conditions of this License, without
 any additional terms or conditions. Notwithstanding the above, nothing herein
 shall supersede or modify the terms of any separate license agreement you
 may have executed with Licensor regarding such Contributions.
 6. Trademarks. This License does not grant permission to use the trade names,
 trademarks, service marks, or product names of the Licensor, except as required
 for reasonable and customary use in describing the origin of the Work and
 reproducing the content of the NOTICE file.
 7. Disclaimer of Warranty. Unless required by applicable law or agreed to
 in writing, Licensor provides the Work (and each Contributor provides its
 Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied, including, without limitation, any warranties
 or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR
 A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness
 of using or redistributing the Work and assume any risks associated with Your
 exercise of permissions under this License.
 8. Limitation of Liability. In no event and under no legal theory, whether
 in tort (including negligence), contract, or otherwise, unless required by
 applicable law (such as deliberate and grossly negligent acts) or agreed to
 in writing, shall any Contributor be liable to You for damages, including
 any direct, indirect, special, incidental, or consequential damages of any
 character arising as a result of this License or out of the use or inability
 to use the Work (including but not limited to damages for loss of goodwill,
 work stoppage, computer failure or malfunction, or any and all other commercial
 damages or losses), even if such Contributor has been advised of the possibility
 of such damages.
 9. Accepting Warranty or Additional Liability. While redistributing the Work
 or Derivative Works thereof, You may choose to offer, and charge a fee for,
 acceptance of support, warranty, indemnity, or other liability obligations
 and/or rights consistent with this License. However, in accepting such obligations,
 You may act only on Your own behalf and on Your sole responsibility, not on
 behalf of any other Contributor, and only if You agree to indemnify, defend,
 and hold each Contributor harmless for any liability incurred by, or claims
 asserted against, such Contributor by reason of your accepting any such warranty
 or additional liability. END OF TERMS AND CONDITIONS
 APPENDIX: How to apply the Apache License to your work.
 To apply the Apache License to your work, attach the following boilerplate
 notice, with the fields enclosed by brackets "[]" replaced with your own identifying
 information. (Don't include the brackets!) The text should be enclosed in
 the appropriate comment syntax for the file format. We also recommend that
 a file or class name and description of purpose be included on the same "printed
 page" as the copyright notice for easier identification within third-party
 archives.
 Copyright [yyyy] [name of copyright owner]
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 http://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,201 +0,0 @@
                                  Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
   1. Definitions.
      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.
      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.
      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.
      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.
      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.
      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.
      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).
      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.
      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."
      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.
   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.
   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.
   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:
      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and
      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and
      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and
      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.
      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.
   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.
   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.
   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.
   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.
   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.
   END OF TERMS AND CONDITIONS
   APPENDIX: How to apply the Apache License to your work.
      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.
   Copyright [yyyy] [name of copyright owner]
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
       http://www.apache.org/licenses/LICENSE-2.0
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
--- a/README.md
+++ b/README.md
@@ -7,17 +7,14 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod
 ### Preliminaries
-1. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
+1. [Install @sap/cds-dk](https://cap.cloud.sap/docs/get-started/) as documented in [capire](https://cap.cloud.sap)
 2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/in-vscode)
   ```sh
   npm i -g @sap/cds-dk
   ```
 2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
 ### Download
-If you've [Git](https://git-scm.com/downloads) installed, clone this repo as shown below, otherwise [download as ZIP file](archive/master.zip).
+Clone this repo as shown below, if you have [git](https://git-scm.com/downloads) installed,
 otherwise [download as zip file](archive/master.zip).
 ```sh
 git clone https://github.com/sap-samples/cloud-cap-samples samples
@@ -42,45 +39,37 @@ cds watch bookshop
 After that open this link in your browser: [http://localhost:4004](http://localhost:4004)
 When asked to log in, type `alice` as user and leave the password field blank, which is the [default user](https://cap.cloud.sap/docs/node.js/authentication#mocked).
 ### Testing
 Run the provided tests with [_jest_](http://jestjs.io) or [_mocha_](http://mochajs.org), for example:
 ```sh
 npx jest
 ```
 > While mocha is a bit smaller and faster, jest runs tests in parallel and isolation, which allows to run all tests.
-### Serve `npm`
+### Serve `npm` 
-We've included a simple npm registry mock, which allows you to do an `npm install @capire/<package>` locally. Use it as follows:
+We've simple npm registry mock included which allows you to do an `npm install @capire/<package>` anywhere locally. Use it as follows:
 1. Start the @capire registry:
 ```sh
 npm run registry
 ```
-> While running this will have `@capire:registry=http://localhost:4444` set with npmrc.
+> While running this will have `@capire:registry=http://localhost:4444` set with npmrc. 
 2. Install one of the @capire packages wherever you like, for example:
 2. Install one of the @capire packages wherever you like, e.g.:
 ```sh
 npm add @capire/common @capire/bookshop
 ```
 ## Code Tours
 Take one of the [guided tours](.tours) in VS Code through our CAP samples and learn which CAP features are showcased by the different parts of the repository. Just install the [CodeTour extension](https://marketplace.visualstudio.com/items?itemName=vsls-contrib.codetour) for VS Code. We'll add more code tours in the future. Stay tuned!
 ## Get Support
 Check out the documentation at [https://cap.cloud.sap](https://cap.cloud.sap). <br>
-In case you've a question, find a bug, or otherwise need support, use our [community](https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce) to get more visibility.
+In case you have a question, find a bug, or otherwise need support, please use our [community](https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce).
 ## License
-Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, version 2.0 except as noted otherwise in the [LICENSE](LICENSE.txt) file.
+Copyright (c) 2020 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, version 2.0 except as noted otherwise in the [LICENSE](LICENSES/Apache-2.0.txt) file.
--- a/bookshop/app/vue/index.html
+++ b/bookshop/app/vue/index.html
@@ -36,7 +36,7 @@
            <td class="rating-stars">
                {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }}
            </td>
-            <td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
+            <td>{{ book.currency.symbol }} {{ book.price }}</td>
        </tr>
    </table>
--- a/bookshop/db/data/sap.capire.bookshop-Authors.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Authors.csv
@@ -1,5 +1,5 @@
-ID;name
+ID;name;dateOfBirth;placeOfBirth;dateOfDeath;placeOfDeath
-101;Emily Brontë
+101;Emily Brontë;1818-07-30;Thornton, Yorkshire;1848-12-19;Haworth, Yorkshire
-107;Charlotte Brontë
+107;Charlotte Brontë;1818-04-21;Thornton, Yorkshire;1855-03-31;Haworth, Yorkshire
-150;Edgar Allen Poe
+150;Edgar Allen Poe;1809-01-19;Boston, Massachusetts;1849-10-07;Baltimore, Maryland
-170;Richard Carpenter
+170;Richard Carpenter;1929-08-14;King’s Lynn, Norfolk;2012-02-26;Hertfordshire, England
--- a/bookshop/db/data/sap.capire.bookshop-Books.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Books.csv
@@ -1,6 +1,6 @@
-ID;title;author_ID;genre_ID
+ID;title;descr;author_ID;stock;price;currency_code;genre_ID
-201;Wuthering Heights;101;11
+201;Wuthering Heights;"Wuthering Heights, Emily Brontë's only novel, was published in 1847 under the pseudonym ""Ellis Bell"". It was written between October 1845 and June 1846. Wuthering Heights and Anne Brontë's Agnes Grey were accepted by publisher Thomas Newby before the success of their sister Charlotte's novel Jane Eyre. After Emily's death, Charlotte edited the manuscript of Wuthering Heights and arranged for the edited version to be published as a posthumous second edition in 1850.";101;12;11.11;GBP;11
-207;Jane Eyre;107;11
+207;Jane Eyre;"Jane Eyre /ɛər/ (originally published as Jane Eyre: An Autobiography) is a novel by English writer Charlotte Brontë, published under the pen name ""Currer Bell"", on 16 October 1847, by Smith, Elder & Co. of London. The first American edition was published the following year by Harper & Brothers of New York. Primarily a bildungsroman, Jane Eyre follows the experiences of its eponymous heroine, including her growth to adulthood and her love for Mr. Rochester, the brooding master of Thornfield Hall. The novel revolutionised prose fiction in that the focus on Jane's moral and spiritual development is told through an intimate, first-person narrative, where actions and events are coloured by a psychological intensity. The book contains elements of social criticism, with a strong sense of Christian morality at its core and is considered by many to be ahead of its time because of Jane's individualistic character and how the novel approaches the topics of class, sexuality, religion and feminism.";107;11;12.34;GBP;11
-251;The Raven;150;16
+251;The Raven;"""The Raven"" is a narrative poem by American writer Edgar Allan Poe. First published in January 1845, the poem is often noted for its musicality, stylized language, and supernatural atmosphere. It tells of a talking raven's mysterious visit to a distraught lover, tracing the man's slow fall into madness. The lover, often identified as being a student, is lamenting the loss of his love, Lenore. Sitting on a bust of Pallas, the raven seems to further distress the protagonist with its constant repetition of the word ""Nevermore"". The poem makes use of folk, mythological, religious, and classical references.";150;333;13.13;USD;16
-252;Eleonora;150;16
+252;Eleonora;"""Eleonora"" is a short story by Edgar Allan Poe, first published in 1842 in Philadelphia in the literary annual The Gift. It is often regarded as somewhat autobiographical and has a relatively ""happy"" ending.";150;555;14;USD;16
-271;Catweazle;170;13
+271;Catweazle;Catweazle is a British fantasy television series, starring Geoffrey Bayldon in the title role, and created by Richard Carpenter for London Weekend Television. The first series, produced and directed by Quentin Lawrence, was screened in the UK on ITV in 1970. The second series, directed by David Reid and David Lane, was shown in 1971. Each series had thirteen episodes, most but not all written by Carpenter, who also published two books based on the scripts.;170;22;15;EUR;13
--- a/bookshop/db/data/sap.capire.bookshop-Books_texts.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Books_texts.csv
@@ -1,5 +1,5 @@
-ID;locale;title
+ID;locale;title;descr
-201;de;Sturmhöhe
+201;de;Sturmhöhe;Sturmhöhe (Originaltitel: Wuthering Heights) ist der einzige Roman der englischen Schriftstellerin Emily Brontë (1818–1848). Der 1847 unter dem Pseudonym Ellis Bell veröffentlichte Roman wurde vom viktorianischen Publikum weitgehend abgelehnt, heute gilt er als ein Klassiker der britischen Romanliteratur des 19. Jahrhunderts.
-201;fr;Les Hauts de Hurlevent
+201;fr;Les Hauts de Hurlevent;Les Hauts de Hurlevent (titre original : Wuthering Heights), parfois orthographié Les Hauts de Hurle-Vent, est l'unique roman d'Emily Brontë, publié pour la première fois en 1847 sous le pseudonyme d’Ellis Bell. Loin d'être un récit moralisateur, Emily Brontë achève néanmoins le roman dans une atmosphère sereine, suggérant le triomphe de la paix et du Bien sur la vengeance et le Mal.
-207;de;Jane Eyre
+207;de;Jane Eyre;Jane Eyre. Eine Autobiographie (Originaltitel: Jane Eyre. An Autobiography), erstmals erschienen im Jahr 1847 unter dem Pseudonym Currer Bell, ist der erste veröffentlichte Roman der britischen Autorin Charlotte Brontë und ein Klassiker der viktorianischen Romanliteratur des 19. Jahrhunderts. Der Roman erzählt in Form einer Ich-Erzählung die Lebensgeschichte von Jane Eyre (ausgesprochen /ˌdʒeɪn ˈɛə/), die nach einer schweren Kindheit eine Stelle als Gouvernante annimmt und sich in ihren Arbeitgeber verliebt, jedoch immer wieder um ihre Freiheit und Selbstbestimmung kämpfen muss. Als klein, dünn, blass, stets schlicht dunkel gekleidet und mit strengem Mittelscheitel beschrieben, gilt die Heldin des Romans Jane Eyre nicht zuletzt aufgrund der Kino- und Fernsehversionen der melodramatischen Romanvorlage als die bekannteste englische Gouvernante der Literaturgeschichte
-252;de;Eleonora
+252;de;Eleonora;“Eleonora” ist eine Erzählung von Edgar Allan Poe. Sie wurde 1841 erstveröffentlicht. In ihr geht es um das Paradox der Treue in der Treulosigkeit.
--- a/bookshop/db/data/sap.capire.bookshop-Genres.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Genres.csv
@@ -14,8 +14,3 @@ ID;parent_ID;name
 22;21;Autobiography
 23;20;Essay
 24;20;Speech
 30;;Others
 31;30;Other-A
 32;30;Other-A
 33;30;Other-A
 34;30;Other-A
--- a/bookshop/db/schema.cds
+++ b/bookshop/db/schema.cds
@@ -1,19 +1,29 @@
 using { Currency, managed, sap } from '@sap/cds/common';
 namespace sap.capire.bookshop;
-entity Books {
+entity Books : managed {
  key ID : Integer;
  title  : localized String(111);
  descr  : localized String(1111);
  author : Association to Authors;
  genre  : Association to Genres;
  stock  : Integer;
  price  : Decimal;
  currency : Currency;
  image : LargeBinary @Core.MediaType : 'image/png';
 }
-entity Authors {
+entity Authors : managed {
  key ID : Integer;
  name   : String(111);
  dateOfBirth  : Date;
  dateOfDeath  : Date;
  placeOfBirth : String;
  placeOfDeath : String;
  books  : Association to many Books on books.author = $self;
 }
 /** Hierarchically organized Code List for Genres */
 entity Genres : sap.common.CodeList {
  key ID   : Integer;
  parent   : Association to Genres;
--- a/bookshop/index.cds
+++ b/bookshop/index.cds
@@ -1,3 +1,4 @@
 namespace sap.capire.bookshop; //> important for reflection
 using from './db/schema';
 using from './srv/cat-service';
 using from './srv/admin-service';
--- a/bookshop/index.js
+++ b/bookshop/index.js
@@ -0,0 +1 @@
 exports.CatalogService = require('./srv/cat-service')
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -3,42 +3,20 @@
  "version": "1.0.0",
  "description": "A simple self-contained bookshop service.",
  "dependencies": {
-    "@sap/cds": "^5.0.4",
+    "@capire/common": "*",
    "@sap/cds": "^4",
    "express": "^4.17.1",
-    "passport": "0.4.1",
+    "passport": "0.4.1"
    "@sap/hana-client": "^2.7.21"
  },
  "scripts": {
    "genres": "cds serve test/genres.cds",
    "start": "cds run",
    "watch": "cds watch"
  },
  "cds": {
    "requires": {
      "db": {
-        "kind": "sql",
+        "kind": "sql"
        "xxx-model": "*",
        "xxx-credentials": {
            "database": "localSqlite.db"
        }
      },
      "[production]": {
          "db": {
              "kind": "hana",
              "model": [
                  "db",
                  "srv"
              ]
          }
      }
    },
    "features": {
      "assert_integrity": false
    },
    "hana": {
        "deploy-format": "hdbtable"
    },
    "cdsc": {
      "beta": {
        "foreignKeyConstraints": true
      }
    }
  }
--- a/bookshop/readme.md
+++ b/bookshop/readme.md
@@ -1,126 +1,31 @@
-# Foreign key constraints on DB
+# Bookshop Getting Started Sample
-As model we use a simplified version of the bookshop scenario, we work with nodejs runtime.
+This stand-alone sample introduces the essential tasks in the development of CAP-based services as also covered in the [Getting Started guide in capire](https://cap.cloud.sap/docs/get-started/in-a-nutshell).
 ## Hypothetical Use Cases
-## Preparation
+1. Build a service that allows to browse _Books_ and _Authors_.
 2. Books have assigned _Genres_ which are organized hierarchically.
 3. All users may browse books without login.
 4. All entries are maintained by Administrators.
 5. End users may order books (the actual order mgmt being out of scope)
-As we want to see the effects of the database constaints, we first need to switch off the integrity checks done by the node runtime. In the `package.json`:
+## Running the Sample
-```json
+
-"cds": {
+```sh
-  ...,
+npm run watch
  "features": {
    "assert_integrity": false
  }
 }
 ```
-Then switch on constraint generation. In the `package.json`:
+## Content & Best Practices
 ```json
 "cds": {
  ...,
  "cdsc": {
    "beta": {
      "foreignKeyConstraints": true
    }
  }
 }
 ```
-## SQLite
+| Links to capire                                                                                           | Sample files / folders               |
-
+| --------------------------------------------------------------------------------------------------------- | ------------------------------------ |
-In SQLite, FK constraints can only be specified during the creation of a table. They cannot be altered for an existing table. So here we at least don't have issues with existing data.
+| [Project Setup and Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)  | [`./`](./)                           |
-
+| [Defining Domain Models](https://cap.cloud.sap/docs/guides/domain-models)                                 | [`./db/schema.cds`](./db/schema.cds) |
-For SQLite, constraint checks need to be enabled by application at runtime for each db connection with the command
+| [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)                                 | [`./srv/*.cds`](./srv)               |
-```sql
+| [Single-purposed Services](https://cap.cloud.sap/docs/guides/providing-services#single-purposed-services) | [`./srv/*.cds`](./srv)               |
-PRAGMA foreign_keys = ON;
+| [Generic Providers](https://cap.cloud.sap/docs/guides/providing-services)                                  | http://localhost:4004                |
-```
+| Using Databases                                            | [`./db/data/*.csv`](./db/data)       |
-We do this via a custom handler in `admin-service.js`.
+| [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)                                     | [`./srv/*.js`](./srv)                |
-
+| Adding Tests                                                 | [`./test`](./test)                   |
-Now run the requests in `requests.http` (use `http://localhost:4004` as server URL). They behave as expected.
+| [Sharing for Reuse](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)          | [`./index.cds`](./index.cds)         |
 But the error messages are not providing any details. They say "constraint violation", but they don't say which table/constraint is violated:
 ```
 HTTP/1.1 500 Internal Server Error
 ...
 {
  "error": {
    "code": "SQLITE_CONSTRAINT",
    "message": "SQLITE_CONSTRAINT: FOREIGN KEY constraint failed in: \nCOMMIT"
  }
 }
 ```
 The runtime constraint checks do provide the name of the restricting association (but not the name of the entity where the association lives).
 ## HANA
 Preparation:
 * logon to cf account (e.g. trial)
 * create HANA service instance: `cf create-service hanatrial hdi-shared bookshop-db`
 First make the deplyoment without constraints (switch off constraint generation in `package.json`).
 * Run `cds build --production`. No constraints are generated.
 * Deploy db model: `cf push -f gen/db`
 * Deploy nodejs app: `cf push -f gen/srv --random-route`. Take note of the app URL.
 Run the requests in `request.http` (use the URL from the previous step as server URL, prepend with `https://`).
 Make sure to introduce some data that violates the constraints. No errors are reported - as expected.
 Now switch on constraint generation in `package.json`. 
 * Run `cds build --production`. The constraints are placed in separate `hdbconstraint` files in `gen\db\src\gen`. They are generated with `VALIDATED ON`.
 * Re-deploy db model: `cf push -f gen/db`. It fails, as the existing data violates the constraints.
 * Check logs: `cf logs bookshop-db-deployer --recent`.
 ```
 Error: com.sap.hana.di.constraint: Could not create the database object [8250005]
  at "src/gen/sap.capire.bookshop.Books_author.hdbconstraint" (1:1)
 Error: com.sap.hana.di.constraint: Database error 7: : feature not supported: referential constraint violated by existing value [8201003]
   at "src/gen/sap.capire.bookshop.Books_author.hdbconstraint" (1:1)
 ```
 You can see which constraint is violated, but there is no info about the offensive entries.
 Now use the requests from `request.http` to fix the entries that have been broken above.
 * Re-deploy db model: `cf push -f gen/db`. It should succeed.
 Again run the requests from `request.http`. This time all changes that would lead to a
 constraint violation fail.
 Inserting a book with non-existing author ID or changing a book's author ID to an invalid value yields
 the message
 ```
 HTTP/1.1 500 Internal Server Error
 ...
 {
  "error": {
    "code": "500",
    "message": "Internal Server Error"
  }
 }
 ```
 When trying to delete a genre that is still referenced in a book we get
 ```
 HTTP/1.1 462 status code 462
 ...
 {
  "error": {
    "code": "462",
    "message": "failed on update or delete by foreign key constraint violation: TrexColumnUpdate failed on table '21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_GENRES' with error: DELETE on 21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_GENRES(ID) failed, because 1 rows with corresponding foreign keys still exist in 21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_BOOKS(GENRE_ID), rc=1536"
  }
 }
 ```
 Note: when using `cdsc` to generate the constraints
 ```
 cdsc Q --beta foreignKeyConstraints -d hana -s hdi -o dbstuff db\schema.cds srv\admin-service.cds
 ```
 there will be constraints for e.g. `sap_common_Currencies_texts`. This cannot be deplyoed, as the corresponding table is removed from `cds` via the tree-shaking mechanism. These constraints need to be removed manually before deployment.
 ## Todo
 * Provide a way to control parameters `VALIDATED` and `ENFORCED` of the constraints (only interesting for HANA, as in SQLite changing constraints after table generation is not possible).
 * Provide some tool to identify existing entries that violate constraints. We can generate a list of `SELECT` statements that find these entries, but how do we run it and show the results to the user?
 * Can runtimes improve the error messages?
--- a/bookshop/sqlite.db
+++ b/bookshop/sqlite.db
--- a/bookshop/srv/admin-service.cds
+++ b/bookshop/srv/admin-service.cds
@@ -1,6 +1,5 @@
 using { sap.capire.bookshop as my } from '../db/schema';
-service AdminService {
+service AdminService @(requires:'admin') {
  entity Books as projection on my.Books;
  entity Authors as projection on my.Authors;
  entity Genres as projection on my.Genres;
 }
--- a/bookshop/srv/admin-service.js
+++ b/bookshop/srv/admin-service.js
@@ -1,15 +1,12 @@
 // sqlite: FK constraint checks need to be enabled by application at runtime
 // for each db connection
 const cds = require('@sap/cds')
 module.exports = cds.service.impl (async function(){ 
-  const db = await cds.connect.to('db')
+module.exports = cds.service.impl (function(){
-
+  this.before ('NEW','Authors', genid)
-  if (db.kind === 'sqlite')
+  this.before ('NEW','Books', genid)
  {
    db.before('BEGIN', function (req) { 
      //console.log('--- PRAGMA foreign_keys = ON ---')
      return this.dbc.run('PRAGMA foreign_keys = ON;')
    })
  }
 })
 /** Generate primary keys for target entity in request */
 async function genid (req) {
  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
  req.data.ID = ID - ID % 100 + 100 + 1
 }
--- a/bookshop/srv/cat-service.cds
+++ b/bookshop/srv/cat-service.cds
@@ -0,0 +1,14 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 service CatalogService @(path:'/browse') {
  @readonly entity Books as SELECT from my.Books {*,
    author.name as author
  } excluding { createdBy, modifiedBy };
  @readonly entity ListOfBooks as SELECT from Books
  excluding { descr, stock };
  @requires: 'authenticated-user'
  action submitOrder ( book: Books:ID, amount: Integer ) returns { stock: Integer };
  event OrderedBook : { book: Books:ID; amount: Integer; buyer: String };
 }
--- a/bookshop/srv/cat-service.js
+++ b/bookshop/srv/cat-service.js
@@ -0,0 +1,28 @@
 const cds = require('@sap/cds')
 const { Books } = cds.entities ('sap.capire.bookshop')
 class CatalogService extends cds.ApplicationService { async init(){
  // Reduce stock of ordered books if available stock suffices
  this.on ('submitOrder', async req => {
    const {book,amount} = req.data, tx = cds.tx(req)
    let {stock} = await tx.read('stock').from(Books,book)
    if (stock >= amount) {
      await tx.update (Books,book).with ({ stock: stock -= amount })
      this.emit ('OrderedBook', { book, amount, buyer:req.user.id })
      return { stock }
    }
    else return req.error (409,`${amount} exceeds stock for book #${book}`)
  })
  // Add some discount for overstocked books
  this.after ('READ','Books', each => {
    if (each.stock > 111) {
      each.title += ` -- 11% discount!`
    }
  })
  return super.init()
 }}
 module.exports = { CatalogService }
--- a/bookshop/test/genres.cds
+++ b/bookshop/test/genres.cds
@@ -0,0 +1,4 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 service TestService {
  entity Genres as projection on my.Genres;
 }
--- a/bookshop/test/genres.http
+++ b/bookshop/test/genres.http
@@ -0,0 +1,38 @@
 #################################################
 #
 #   Genres
 #
 GET http://localhost:4004/test/Genres?
 ###
 GET http://localhost:4004/test/Genres?
 &$filter=parent_ID eq null&$select=name
 &$expand=children($select=name)
 ###
 POST http://localhost:4004/test/Genres?
 Content-Type: application/json
 { "ID":100, "name":"Some Sample Genres...", "children":[
    { "ID":101, "name":"Cat", "children":[
        { "ID":102, "name":"Kitty", "children":[
            { "ID":103, "name":"Kitty Cat", "children":[
                { "ID":104, "name":"Aristocat" } ]},
            { "ID":105, "name":"Kitty Bat" } ]},
        { "ID":106, "name":"Catwoman", "children":[
            { "ID":107, "name":"Catalina" } ]} ]},
    { "ID":108, "name":"Catweazle" }
 ]}
 ###
 GET http://localhost:4004/test/Genres(100)?
 # &$expand=children
 # &$expand=children($expand=children($expand=children($expand=children)))
 ###
 DELETE http://localhost:4004/test/Genres(103)
 ###
 DELETE http://localhost:4004/test/Genres(100)
 ###
--- a/bookshop/test/requests.http
+++ b/bookshop/test/requests.http
@@ -1,68 +1,82 @@
 # running locally
@server = http://localhost:4004
-
+@me = Authorization: Basic {{$processEnv USER}}:
 # running on cf
 #@server = https://bookshop-srv-....hana.ondemand.com
 ### get all books
 GET {{server}}/admin/Books
 ### get all authors
 GET {{server}}/admin/Authors
 ### get all genres
 GET {{server}}/admin/Genres
-### create book with wrong author ID -> should fail
+### ------------------------------------------------------------------------
-POST {{server}}/admin/Books
+# Get service info
-Content-Type: application/json
+GET {{server}}/browse
 {{me}}
 {
  "ID": 701,
  "title": "XXX",
  "author": { "ID": 9999 }
 }
-### create book with correct author ID -> should work
+### ------------------------------------------------------------------------
 # Get $metadata document
 GET {{server}}/browse/$metadata
 {{me}}
 ### ------------------------------------------------------------------------
 # Browse Books as any user
 GET {{server}}/browse/Books?
  # &$select=title,stock
  # &$expand=currency
  # &sap-language=de
 {{me}}
 ### ------------------------------------------------------------------------
 # Fetch Authors as admin
 GET {{server}}/admin/Authors?
  # &$select=name,dateOfBirth,placeOfBirth
  # &$expand=books($select=title;$expand=currency)
  # &$filter=ID eq 101
  # &sap-language=de
 Authorization: Basic alice:
 ### ------------------------------------------------------------------------
 # Create book
 POST {{server}}/admin/Books
 Content-Type: application/json;IEEE754Compatible=true
 Authorization: Basic alice:
 {
-  "ID": 702,
+  "ID": 2,
  "title": "Poems : Pocket Poets",
-  "author": { "ID": 101 }
+  "descr": "The Everyman's Library Pocket Poets hardcover series is popular for its compact size and reasonable price which does not compromise content. Poems: Bronte contains poems that demonstrate a sensibility elemental in its force with an imaginative discipline and flexibility of the highest order. Also included are an Editor's Note and an index of first lines.",
  "author": { "ID": 101 },
  "genre": { "ID": 12 },
  "stock": 5,
  "price": "12.05",
  "currency": { "code": "USD" }
 }
 ### delete book
 DELETE {{server}}/admin/Books(ID=701)
-### change book to wrong author ID -> should fail
+### ------------------------------------------------------------------------
 # Put image to books
 PUT {{server}}/admin/Books(2)/image
 Content-Type: image/png
 Authorization: Basic alice:
-PATCH {{server}}/admin/Books(ID=207)
+data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANwAAADcCAYAAAAbWs+BAAAGwElEQVR4Ae3cwZFbNxBFUY5rkrDTmKAUk5QT03Aa44U22KC7NHptw+DRikVAXf8fzC3u8Hj4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgZzAW26USQT+e4HPx+Mz+RRvj0e0kT+SD2cWAQK1gOBqH6sEogKCi3IaRqAWEFztY5VAVEBwUU7DCNQCgqt9rBKICgguymkYgVpAcLWPVQJRAcFFOQ0jUAsIrvaxSiAqILgop2EEagHB1T5WCUQFBBflNIxALSC42scqgaiA4KKchhGoBQRX+1glEBUQXJTTMAK1gOBqH6sEogKCi3IaRqAWeK+Xb1z9iN558fHxcSPS9p2ezx/ROz4e4TtIHt+3j/61hW9f+2+7/+UXbifjewIDAoIbQDWSwE5AcDsZ3xMYEBDcAKqRBHYCgtvJ+J7AgIDgBlCNJLATENxOxvcEBgQEN4BqJIGdgOB2Mr4nMCAguAFUIwnsBAS3k/E9gQEBwQ2gGklgJyC4nYzvCQwICG4A1UgCOwHB7WR8T2BAQHADqEYS2AkIbifjewIDAoIbQDWSwE5AcDsZ3xMYEEjfTzHwiK91B8npd6Q8n8/oGQ/ckRJ9vvQwv3BpUfMIFAKCK3AsEUgLCC4tah6BQkBwBY4lAmkBwaVFzSNQCAiuwLFEIC0guLSoeQQKAcEVOJYIpAUElxY1j0AhILgCxxKBtIDg0qLmESgEBFfgWCKQFhBcWtQ8AoWA4AocSwTSAoJLi5pHoBAQXIFjiUBaQHBpUfMIFAKCK3AsEUgLCC4tah6BQmDgTpPsHSTFs39p6fQ7Q770UsV/Ov19X+2OFL9wxR+rJQJpAcGlRc0jUAgIrsCxRCAtILi0qHkECgHBFTiWCKQFBJcWNY9AISC4AscSgbSA4NKi5hEoBARX4FgikBYQXFrUPAKFgOAKHEsE0gKCS4uaR6AQEFyBY4lAWkBwaVHzCBQCgitwLBFICwguLWoegUJAcAWOJQJpAcGlRc0jUAgIrsCxRCAt8J4eePq89B0ar3ZnyOnve/rfn1+400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810l8JZ/m78+szP/zI47fJo7Q37vgJ7PHwN/07/3TOv/9gu3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhg4P6H9J0maYHXuiMlrXf+vOfA33Turf3C5SxNItAKCK4lsoFATkBwOUuTCLQCgmuJbCCQExBcztIkAq2A4FoiGwjkBASXszSJQCsguJbIBgI5AcHlLE0i0AoIriWygUBOQHA5S5MItAKCa4lsIJATEFzO0iQCrYDgWiIbCOQEBJezNIlAKyC4lsgGAjkBweUsTSLQCgiuJbKBQE5AcDlLkwi0Akff//Dz6U+/I6U1/sUNr3bnytl3kPzi4bXb/cK1RDYQyAkILmdpEoFWQHAtkQ0EcgKCy1maRKAVEFxLZAOBnIDgcpYmEWgFBNcS2UAgJyC4nKVJBFoBwbVENhDICQguZ2kSgVZAcC2RDQRyAoLLWZpEoBUQXEtkA4GcgOByliYRaAUE1xLZQCAnILicpUkEWgHBtUQ2EMgJCC5naRKBVkBwLZENBHIC/4M7TXIv+3PS22d24qvdQfL3C/7N5P5i/MLlLE0i0AoIriWygUBOQHA5S5MItAKCa4lsIJATEFzO0iQCrYDgWiIbCOQEBJezNIlAKyC4lsgGAjkBweUsTSLQCgiuJbKBQE5AcDlLkwi0AoJriWwgkBMQXM7SJAKtgOBaIhsI5AQEl7M0iUArILiWyAYCOQHB5SxNItAKCK4lsoFATkBwOUuTCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAvyrwDySEJ2VQgUSoAAAAAElFTkSuQmCC
 Content-Type:application/json
 {"author_ID": 9999}
 ### change book to correct author ID -> should work
 PATCH {{server}}/admin/Books(ID=207)
 Content-Type:application/json
 {"author_ID": 170}
-
+### ------------------------------------------------------------------------
-### delete "leaf" genre that is used in a book -> should not work
+# Reading image from from the server directly
-DELETE {{server}}/admin/Genres(ID=13)
+GET {{server}}/browse/Books(2)/image
 ### delete "leaf" genre that is not used in a book -> should work
 DELETE {{server}}/admin/Genres(ID=14)
-### delete "header" genre where leaves are used in a book -> should not work
+### ------------------------------------------------------------------------
-DELETE {{server}}/admin/Genres(ID=10)
+# Submit Order as authenticated user
 # (send that three times to get out-of-stock message)
 POST {{server}}/browse/submitOrder
 Content-Type: application/json
 {{me}}
 { "book":201, "amount":5 }
-### delete "header" genre where leaves are not used in a book -> should work and delete all leaves
+### ------------------------------------------------------------------------
-DELETE {{server}}/admin/Genres(ID=30)
+# Browse Genres
 GET {{server}}/browse/Genres?
 # &$filter=parent_ID eq null&$select=name
 # &$expand=children($select=name)
 {{me}}
--- a/common/package.json
+++ b/common/package.json
@@ -1,8 +1,4 @@
 {
  "name": "@capire/common",
-  "description": "Provides a pre-built extension package for std @sap/cds/common",
+  "version": "1.0.0"
  "version": "1.0.0",
  "dependencies": {
    "@sap/cds": "*"
  }
 }
--- a/fiori/app/_i18n/i18n.properties
+++ b/fiori/app/_i18n/i18n.properties
@@ -11,7 +11,6 @@ DateOfBirth = Date of Birth
 DateOfDeath = Date of Death
 PlaceOfBirth = Place of Birth
 PlaceOfDeath = Place of Death
 Age = Age
 Authors = Authors
 Order = Order
 Orders = Orders
--- a/fiori/app/_i18n/i18n_de.properties
+++ b/fiori/app/_i18n/i18n_de.properties
@@ -6,7 +6,6 @@ Authors = Autoren
 Author = Autor
 AuthorID = ID des Autors
 AuthorName = Name des Autors
 Age = Alter
 Name = Name
 Stock = Bestand
 Order = Bestellung
--- a/fiori/app/admin-fiori.html
+++ b/fiori/app/admin-fiori.html
@@ -13,7 +13,7 @@
 			applications: {
 				"browse-books": {
 					title: "Browse Books",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=bookshop",
 					applicationType : "URL",
 					url: "/browse/webapp",
@@ -21,7 +21,7 @@
 				},
 				"manage-books": {
 					title: "Manage Books",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=admin",
 					applicationType : "URL",
 					url: "/admin/webapp",
@@ -29,7 +29,7 @@
 				},
 				"manage-orders": {
 					title: "Manage Orders",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=orders",
 					applicationType : "URL",
 					url: "/orders/webapp",
@@ -40,7 +40,8 @@
 	</script>
 	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+	<!-- <script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js" -->
 	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.78.6/resources/sap-ui-core.js"
    	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
    	data-sap-ui-compatVersion="edge"
    	data-sap-ui-theme="sap_fiori_3"
--- a/fiori/app/admin/fiori-service.cds
+++ b/fiori/app/admin/fiori-service.cds
@@ -1,4 +1,4 @@
-using { AdminService } from '../../db/schema';
+using AdminService from '@capire/bookshop';
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -39,27 +39,6 @@ annotate AdminService.Books with @(
 	}
 );
 annotate AdminService.Authors with @(
 	UI: {
 		HeaderInfo: {
 			Description: {Value: lifetime}
 		},
 		Facets: [
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Books}', Target: 'books/@UI.LineItem'},
 		],
 		FieldGroup#Details: {
 			Data: [
 				{Value: placeOfBirth},
 				{Value: placeOfDeath},
 				{Value: dateOfBirth},
 				{Value: dateOfDeath},
 				{Value: age, Label: '{i18n>Age}'},
 			]
 		},
 	}
 );
 ////////////////////////////////////////////////////////////
--- a/fiori/app/bookshop.html
+++ b/fiori/app/bookshop.html
@@ -1,3 +1,3 @@
 <head>
-  <meta http-equiv="refresh" content="0;url=bookshop/index.html">
+  <meta http-equiv="refresh" content="0;url=vue/bookshop/index.html">
 </head>
--- a/fiori/app/services.cds
+++ b/fiori/app/services.cds
--- a/fiori/app/reviews.html
+++ b/fiori/app/reviews.html
@@ -1,3 +1,3 @@
 <head>
-  <meta http-equiv="refresh" content="0;url=reviews/index.html">
+  <meta http-equiv="refresh" content="0;url=vue/reviews/index.html">
 </head>
--- a/fiori/db/hana/index.cds
+++ b/fiori/db/hana/index.cds
@@ -1,10 +0,0 @@
 //
 //  Add Author.age and .lifetime with a DB-specific function
 //
 using { AdminService } from '../schema';
 extend projection AdminService.Authors with {
  YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,
  YEAR(dateOfBirth) || ' – ' || YEAR(dateOfDeath) as lifetime : String
 }
--- a/fiori/db/schema.cds
+++ b/fiori/db/schema.cds
@@ -1,8 +0,0 @@
 using { sap.capire.bookshop } from '@capire/bookshop';
 // Forward-declare calculated fields to be filled in database-specific ways
 // TODO find a better way to have 'default' fields that still can be overwritten.
 extend bookshop.Authors with {
 	virtual age: Integer;
 	virtual lifetime: String;
 }
--- a/fiori/db/sqlite/index.cds
+++ b/fiori/db/sqlite/index.cds
@@ -1,10 +0,0 @@
 //
 //  Add Author.age and .lifetime with a DB-specific function
 //
 using { AdminService } from '../schema';
 extend projection AdminService.Authors with {
  strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth)              as age: Integer,
  strftime('%Y',dateOfBirth) || ' – ' || strftime('%Y',dateOfDeath)  as lifetime : String
 }
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -6,39 +6,25 @@
    "@capire/reviews": "*",
    "@capire/orders": "*",
    "@capire/common": "*",
-    "@sap/cds": ">=4",
+    "@sap/cds": "^4",
    "express": "^4.17.1",
-    "passport": "^0.4.1"
+    "passport": "0.4.1"
  },
  "scripts": {
    "start": "cds run --in-memory?",
    "watch": "cds watch"
  },
  "cds": {
    "hana": {
      "deploy-format": "hdbtable"
    },
    "requires": {
      "auth": {
        "strategy": "dummy"
      },
      "ReviewsService": {
-        "kind": "odata",
+        "kind": "odata", "model": "@capire/reviews"
        "model": "@capire/reviews"
      },
      "OrdersService": {
-        "kind": "odata",
+        "kind": "odata", "model": "@capire/orders"
        "model": "@capire/orders"
      },
      "db": {
-        "kind": "sql",
+        "kind": "sql"
        "[development]": {
          "model": "db/sqlite"
        },
        "[production]": {
          "model": "db/hana"
        }
      }
    }
  }
-}
+}
--- a/fiori/server.js
+++ b/fiori/server.js
@@ -1,18 +1,19 @@
 const express = require ('express')
 const cds = require ('@sap/cds')
 cds.once('bootstrap',(app)=>{
-  app.use ('/orders/webapp', _from('@capire/orders/app/orders/webapp/manifest.json'))
+  const {dirname} = require ('path')
-  app.use ('/bookshop', _from('@capire/bookshop/app/vue/index.html'))
+  // serving the orders app imported from @capire/orders
-  app.use ('/reviews', _from('@capire/reviews/app/vue/index.html'))
+  const orders_app = dirname (require.resolve('@capire/orders/app/orders/webapp/manifest.json'))
  app.use ('/orders/webapp', express.static(orders_app))
  // serving the vue.js app imported from @capire/bookshop
  const bookshop_app = dirname (require.resolve('@capire/bookshop/app/vue/index.html'))
  app.use ('/vue/bookshop', express.static(bookshop_app))
  // serving the vue.js app imported from @capire/reviews
  const reviews_app = dirname (require.resolve('@capire/reviews/app/vue/index.html'))
  app.use ('/vue/reviews', express.static(reviews_app))
 })
 cds.once('served', require('./srv/mashup'))
 module.exports = cds.server
 // -----------------------------------------------------------------------
 // Helper for serving static content from npm-installed packages
 const {static} = require('express')
 const {dirname} = require('path')
 const _from = target => static (dirname (require.resolve(target)))
--- a/fiori/srv/mashup.js
+++ b/fiori/srv/mashup.js
@@ -49,7 +49,7 @@ module.exports = async()=>{ // called by server.js
  //
  // Reduce stock of ordered books for orders are created from Orders admin UI
  //
-  OrdersService.on ('OrderChanged', (msg) => {
+  OrdersService.on ('OrderChanged', async (msg) => {
    console.debug ('> received:', msg.event, msg.data)
    const { product, deltaAmount } = msg.data
    return UPDATE (Books) .where ('ID =', product)
--- a/fiori/test/requests.http
+++ b/fiori/test/requests.http
@@ -42,36 +42,7 @@ GET {{bookshop}}/browse/Books(201)?
 #################################################
 #
-#   Orders Service, incl. draft choreography
+#   Orders Service
 #
@newOrderID = e939604c-ab83-4d4f-bdb6-95fe30b3773e
 GET {{bookshop}}/orders/Orders
 ### Create order, still inactive
 POST {{bookshop}}/orders/Orders
 Content-Type: application/json
 {"ID": "{{newOrderID}}"}
 ### Get inactive order.  We have to specify `IsActiveEntity`.
 GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
 ### Activate order using `.../<servicename>.draftActivate`
 POST {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
 Content-Type: application/json
 ### Get active order
 GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
 ### Create author
 POST {{bookshop}}/admin/Authors
 Content-Type: application/json
 Authorization: Basic alice:
 {
  "ID": 200,
  "name": "William Shakespeare",
  "dateOfBirth": "1564-04-26",
  "dateOfDeath": "1616-04-23"
 }
--- a/orders/db/schema.cds
+++ b/orders/db/schema.cds
@@ -13,7 +13,7 @@ entity Orders_Items {
  up_       : Association to Orders;
  product   : Association to Products @assert.integrity:false; // REVISIT: this is a temporary workaround for a glitch in cds-runtime
  amount    : Integer;
-  title     : String; //> intentionally replicated as snapshot from product.title
+  title     : String;
  price     : Double;
 }
@@ -21,3 +21,6 @@ entity Orders_Items {
 entity Products @(cds.persistence.skip:'always') {
  key ID : String;
 }
 // Activate extension package
 using from '@capire/common';
--- a/orders/package.json
+++ b/orders/package.json
@@ -2,6 +2,7 @@
  "name": "@capire/orders",
  "version": "1.0.0",
  "dependencies": {
-    "@sap/cds": ">=4.3.0"
+    "@capire/common": "*",
    "@sap/cds": "^4.3.0"
  }
 }
--- a/orders/srv/orders-service.js
+++ b/orders/srv/orders-service.js
@@ -11,7 +11,7 @@ class OrdersService extends cds.ApplicationService {
        const { amount:before } = await cds.tx(req).run (
          SELECT.one.from (OrderItems, oi => oi.amount) .where ({up__ID:ID, product_ID})
        )
-        if (amount != before) await this.orderChanged (product_ID, amount-before)
+        if (amount != before) this.orderChanged (product_ID, amount-before)
      }
    })
@@ -20,7 +20,7 @@ class OrdersService extends cds.ApplicationService {
      const Items = await cds.tx(req).run (
        SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({up__ID:ID})
      )
-      if (Items) await Promise.all (Items.map(it => this.orderChanged (it.product_ID, -it.amount)))
+      if (Items) for (let it of Items) this.orderChanged (it.product_ID, -it.amount)
    })
    return super.init()
--- a/package.json
+++ b/package.json
@@ -17,11 +17,10 @@
    "chai": "^4.2.0",
    "chai-as-promised": "^7.1.1",
    "chai-subset": "^1.6.0",
-    "sqlite3": "^5.0.0"
+    "sqlite3": "^5"
  },
  "scripts": {
-    "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
+    "registry": "cd .registry && node server.js",
    "registry": "node .registry/server.js",
    "bookshop": "cds watch bookshop",
    "fiori": "cds watch fiori",
    "media": "cds watch media",
--- a/reviews/app/vue/app.js
+++ b/reviews/app/vue/app.js
@@ -37,7 +37,7 @@ const reviews = new Vue ({
            reviews.message = {}
        },
-        newReview () {
+        async newReview () {
            reviews.review = {}
            reviews.message = {}
            setTimeout (()=> $('form > input').focus(), 111)
--- a/reviews/package.json
+++ b/reviews/package.json
@@ -7,7 +7,7 @@
    "index.cds"
  ],
  "dependencies": {
-    "@sap/cds": ">=4",
+    "@sap/cds": "^4",
    "express": "^4.17.1"
  },
  "scripts": {
--- a/reviews/readme.md
+++ b/reviews/readme.md
@@ -2,23 +2,20 @@
 ## Run all-in-one
-Open a terminal window and run the `fiori` app in it:
+Open a terminal window and run the bookshop in it:
 ```sh
-npm run fiori
+npm run bookshop
 ```
-## Run as Separate Services
+## Run as separate services
 Open two terminal windows. In the first one start the reviews service stand-alone:
 Open two terminal windows, and in the first one start the reviews service stand-alone:
 ```sh
 npm run reviews-service
 ```
-In the second one start the `fiori` app:
+In the the second one start the bookshop:
 ```sh
-npm run fiori
+npm run bookshop
 ```
--- a/reviews/srv/reviews-service.cds
+++ b/reviews/srv/reviews-service.cds
@@ -17,7 +17,7 @@ service ReviewsService {
  annotate Reviews with {
    subject  @mandatory;
    title    @mandatory;
-    rating   @assert.range;
+    rating   @assert.enum;
  }
 }
@@ -27,14 +27,7 @@ service ReviewsService {
 annotate ReviewsService.Reviews with @restrict:[
  { grant:'READ',   to:'any' },                 // everybody can read reviews
  { grant:'CREATE', to:'authenticated-user' },  // users must login to add reviews
-  /////////////////////////////////////////////////
+  { grant:'UPDATE', to:'authenticated-user', where:'reviewer=$user' },
  //
  // Temporarily disabling this due to glitch in CAP Node.js runtime:
  // { grant:'UPDATE', to:'authenticated-user', where:'reviewer=$user' },
  // -> reenable it when the issue is fixed
     { grant:'UPDATE', to:'authenticated-user' },
  //
  ////////////////////////////////////////////////////
  { grant:'DELETE', to:'admin' },
 ];
--- a/reviews/srv/reviews-service.js
+++ b/reviews/srv/reviews-service.js
@@ -1,5 +1,5 @@
 const cds = require ('@sap/cds')
-module.exports = cds.service.impl (function(){
+module.exports = cds.service.impl (async function(){
  // Get the CSN definition for Reviews from the db schema for sub-sequent queries
  // ( Note: we explicitly specify the namespace to support embedded reuse )
@@ -16,7 +16,7 @@ module.exports = cds.service.impl (function(){
      SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
    )
    global.it || console.log ('< emitting:', 'reviewed', { subject, rating })
-    await this.emit ('reviewed', { subject, rating })
+    this.emit ('reviewed', { subject, rating })
  })
  // Increment counter for reviews considered helpful
--- a/samples.md
+++ b/samples.md
@@ -1,7 +1,7 @@
 # Overview of Samples
-The following list gives an overview of the samples provided in subdirectories.
+The list below gives an overview of the samples provided in subdirectories.
-Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](all-in-one-monorepo) umbrella setup.
+Each sub directory essentially is a individual npm package arranged in an [all-in-one monorepo](all-in-one-monorepo) umbrella setup.
 ## [@capire/hello-world](hello)
@@ -13,7 +13,7 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 - [Getting Started](https://cap.cloud.sap/docs/get-started/in-a-nutshell) with CAP, briefly introducing:
 - [Project Setup](https://cap.cloud.sap/docs/get-started/) and [Layouts](https://cap.cloud.sap/docs/get-started/projects)
- [Domain Modeling](https://cap.cloud.sap/docs/guides/domain-models)
+- [Domain Modelling](https://cap.cloud.sap/docs/guides/domain-models)
 - [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)
 - [Generic Providers](https://cap.cloud.sap/docs/guides/generic-providers)
 - [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)
@@ -22,7 +22,7 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 ## [@capire/common](common)
- Showcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering:
+- Showcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering...
 - Building [extension packages](https://cap.cloud.sap/docs/guides/domain-models#aspects-extensibility)
 - Providing [reuse packages](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)
 - [Verticalization](https://cap.cloud.sap/docs/cds/common#adapting-to-your-needs)
@@ -32,22 +32,22 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 ## [@capire/orders](orders)
- A standalone orders management service, demonstrating:
+- A standalone orders mgmt service, demonstrating...
 - Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with
 - [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)
 ## [@capire/reviews](reviews)
- Shows how to implement a modular service to manage product reviews, including:
+- Shows how to implement a modular service to manage product reviews, including...
 - Consuming other services synchronously and asynchronously
 - Serving requests synchronously
 - Emitting events asynchronously
- Grow as you go, with:
+- Grow as you go, with...
 - Mocking app services
 - Running service meshes
 - Late-cut Micro Services
- As well as managed data, input validations, and authorization
+- As well as managed data, input validations and authorization
 ## [@capire/fiori](fiori)
@@ -57,13 +57,14 @@ Each sub directory essentially is an individual npm package arranged in an [all-
  - [@capire/reviews](reviews)
  - [@capire/orders](orders)
  - [@capire/common](common)
- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:
+- [Adds a Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to...
  - [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files
  - Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)
  - Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)
-  - Serving SAP Fiori apps locally
+  - Serving Fiori apps locally
 - [The Vue.js app](bookshop/app/vue) imported from bookshop is served as well
 <br>
 # All-in-one Monorepo
--- a/test/cds.ql.test.js
+++ b/test/cds.ql.test.js
@@ -1,5 +1,5 @@
 const { expect } = require('../test')
 const cds = require('@sap/cds/lib')
 const { expect } = cds.test
 const CQL = ([cql]) => cds.parse.cql(cql)
 const Foo = { name: 'Foo' }
 const Books = { name: 'capire.bookshop.Books' }
@@ -325,26 +325,7 @@ describe('cds.ql → cqn', () => {
      })
      // using CQL fragments -> uses cds.parse.expr
-      const is_v2 = !!cds.parse.expr('(1,2)').list
+      expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
      if (is_v2) expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
        SELECT: {
          from: { ref: ['Foo'] },
          where: [
            { ref: ['ID'] },
            '=',
            { val: ID },
            'and',
            { ref: ['x'] },
            'in',
            {list:[
              { ref: ['foo'] },
              { val: 'bar' },
              { val: 3 },
            ]}
          ],
        },
      })
      else expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
        SELECT: {
          from: { ref: ['Foo'] },
          where: [
@@ -365,7 +346,7 @@ describe('cds.ql → cqn', () => {
        },
      })
-      if (!is_v2) expect(
+      expect(
        SELECT.from(Foo).where(`x=`, 1, `or y.z is null and (a>`, 2, `or b=`, 3, `)`)
      ).to.eql(CQL`SELECT from Foo where x=1 or y.z is null and (a>2 or b=3)`)
--- a/test/consuming-services.test.js
+++ b/test/consuming-services.test.js
@@ -1,7 +1,7 @@
 const { expect } = require('../test') .run (
  'serve', 'AdminService', '--from', '@capire/bookshop,@capire/common', '--in-memory'
 )
 const cds = require('@sap/cds/lib')
 const { expect } = cds.test (
  'serve', 'AdminService', '--from', '@capire/bookshop,@capire/common', '--in-memory'
 ).in(__dirname)
 describe('Consuming Services locally', () => {
  //
--- a/test/custom-handlers.test.js
+++ b/test/custom-handlers.test.js
@@ -1,7 +1,5 @@
-const { GET, POST, expect } = require('../test') .run ('bookshop')
+const cds = require('@sap/cds/lib'); cds.User = cds.User.Privileged // skip auth
-const cds = require('@sap/cds/lib')
+const { GET, POST, expect } = cds.test('bookshop').in(__dirname,'..')
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 describe('Custom Handlers', () => {
--- a/test/hello-world.test.js
+++ b/test/hello-world.test.js
@@ -1,4 +1,5 @@
-const { GET, expect } = require('../test') .run ('serve','hello/world.cds')
+const cds = require('@sap/cds/lib')
 const { GET, expect } = cds.test('serve','hello/world.cds').in(__dirname,'..')
 describe('Hello world!', () => {
--- a/test/hierarchical-data.test.js
+++ b/test/hierarchical-data.test.js
@@ -1,10 +1,12 @@
-const {expect} = require('../test')
+const cwd = process.cwd(); process.chdir (__dirname) //> only for internal CI/CD@SAP
 const cds = require('@sap/cds/lib')
 const {expect} = cds.test
 // monkey patching older releases:
 if (!cds.compile.cdl) cds.compile.cdl = cds.parse
 const { parse:cdr } = cds.ql
-// should become cds.compile(...) when cds5 is released
+const model = cds.compile.cdl (`
 const model = cds.compile.to.csn (`
  entity Categories {
    key ID   : Integer;
    name     : String;
@@ -23,6 +25,8 @@ describe('Hierarchical Data', ()=>{
    expect (cds.db.model) .to.exist
 	})
 	after(()=> process.chdir(cwd))
 	it ('supports deeply nested inserts', ()=> INSERT.into (Cats,
    { ID:100, name:'Some Cats...', children:[
      { ID:101, name:'Cat', children:[
--- a/test/index.js
+++ b/test/index.js
@@ -1,2 +0,0 @@
 const cds = require('@sap/cds')
 module.exports = cds.test.in(__dirname,'..')
--- a/test/localized-data.test.js
+++ b/test/localized-data.test.js
@@ -1,7 +1,5 @@
-const { GET, expect } = require('../test') .run ('serve', 'test/localized-data.cds', '--in-memory')
+const cds = require('@sap/cds/lib'); cds.User = cds.User.Privileged // skip auth
-const cds = require('@sap/cds/lib')
+const { GET, expect } = cds.test ('serve', __dirname+'/localized-data.cds', '--in-memory')
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 describe('Localized Data', () => {
--- a/test/messaging.test.js
+++ b/test/messaging.test.js
@@ -1,11 +1,13 @@
 const { expect } = require('../test')
 const cds = require('@sap/cds/lib')
 const cwd = process.cwd(); process.chdir (__dirname) //> only for internal CI/CD@SAP
 const {expect} = cds.test
 const _model = '@capire/reviews'
-if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
+cds.User = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 describe('Messaging', ()=>{
    after(()=> process.chdir(cwd))
    it ('should bootstrap sqlite in-memory db', async()=>{
        const db = await cds.deploy (_model) .to ('sqlite::memory:')
        await db.delete('Reviews')
@@ -20,11 +22,11 @@ describe('Messaging', ()=>{
    let N=0, received=[], M=0
    it ('should add messaging event handlers', ()=>{
-        srv.on('reviewed', (msg)=> received.push(msg))
+        srv.on('reviewed', (msg,next)=> { received.push(msg); return next() })
    })
    it ('should add more messaging event handlers', ()=>{
-        srv.on('reviewed', ()=> ++M)
+        srv.on('reviewed', (_,next)=> { ++M; return next() })
    })
    it ('should add review', async ()=>{
@@ -42,16 +44,16 @@ describe('Messaging', ()=>{
        //     { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N },
        // ),
        srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
        ),
        srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
        ),
        srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
        ),
        srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
        ),
    ]))
--- a/test/odata.test.js
+++ b/test/odata.test.js
@@ -1,11 +1,8 @@
-const { GET, expect } = require('../test') .run ('bookshop')
+const cds = require('@sap/cds/lib'); cds.User = cds.User.Privileged // skip auth
-const cds = require('@sap/cds/lib')
+const { GET, expect } = cds.test('bookshop').in(__dirname,'..')
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 describe('OData Protocol', () => {
  it('serves $metadata documents in v4', async () => {
    const { headers, status, data } = await GET `/browse/$metadata`
    expect(status).to.equal(200)
		`@@ -0,0 +1 @@`
							`exports.CatalogService = require('./srv/cat-service')`
		`@@ -1,2 +0,0 @@`
			`const cds = require('@sap/cds')`
			`module.exports = cds.test.in(__dirname,'..')`