@sap/cds-dk 9.5.0 → 9.6.1

package/lib/init/template/html5-repo/index.js

@@ -9,8 +9,8 @@ const { renderAndCopy } = require('../../template')
 module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
     requires() {
-        const { hasHelm, hasHelmUnifiedRuntime } = readProject()
-        if (hasHelm || hasHelmUnifiedRuntime) return ['destination']
+        const { hasKyma } = readProject()
+        if (hasKyma) return ['destination']
     }
 
     static help() {
@@ -37,8 +37,8 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         const project = readProject()
         const {
             isJava, srvPath, appPath, apps,
-            hasApprouter, addApprouter, addContainerize,  addMultitenancy, addWorkzoneStandard,
-            addSample, hasMta, addMta, hasXsuaa, hasMultitenancy, addHelm, addHelmUnifiedRuntime, hasUI5
+            hasApprouter, addApprouter, addContainerize, addKyma, addHelm, addHelmUnifiedRuntime,  addMultitenancy, addWorkzoneStandard, addXsuaa,
+            addSample, hasMta, addMta, hasXsuaa, hasMultitenancy, hasUI5
         } = project
 
         await Promise.all(apps.map(async ({ app }) => {
@@ -65,7 +65,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             await merge({ cds: { requires: { 'html5-repo': true } } }).into('mtx/sidecar/package.json')
         }
 
-        if (addMta || (addApprouter || addWorkzoneStandard || addMultitenancy || addSample) && hasMta) {
+        if (addMta || (addXsuaa || addApprouter || addWorkzoneStandard || addMultitenancy || addSample) && hasMta) {
             const srv = srv4(srvPath)
             project.apps = apps
             const relationships = [{
@@ -109,7 +109,9 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             })
         }
 
-        if (addContainerize) {
+        // cds10
+        // needed because of adding kyma to cli options in case of helm
+        if (addContainerize || (addKyma && !addHelm && !addHelmUnifiedRuntime)) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-html5-deployer` }
@@ -117,7 +119,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await renderAndCopy(join(__dirname, 'files/html5-deployer.package.json.hbs'), 'app/html5-deployer/package.json', project)
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         }

package/lib/init/template/ias/index.js

@@ -24,7 +24,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { isJava, addMta, hasMta, addCfManifest, addHelm, addHelmUnifiedRuntime, addMultitenancy, hasApprouter, hasMultitenancy, srvPath } = project
+        const { isJava, addMta, hasMta, addCfManifest, addKyma, addMultitenancy, hasApprouter, hasMultitenancy, srvPath } = project
 
         if (addMultitenancy) {
             const conf = exists('mtx/sidecar/package.json') ? await read('mtx/sidecar/package.json') : {}
@@ -63,7 +63,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             const identity = { in: 'dependencies', where: { 'alias': 'identity' } }
             await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { project, additions: [identity] })
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { project })

package/lib/init/template/java/index.js

@@ -3,6 +3,7 @@ const cds = require('../../../cds')
 const { exists, copy, rimraf, fs:{promises:{ mkdtemp }}, path } = cds.utils, { join } = path
 const cmd = require('../../../util/command')
 const mvn = require('../../mvn')
+const { merge } = require('../../merge')
 const { bold, info, link } = require('../../../util/term')
 const { URLS, OPTIONS: { NODEJS, JAVA }, COMMAND_ADD } = require('../../constants')
 const { command, options } = cds.cli
@@ -33,9 +34,22 @@ module.exports = class JavaTemplate extends require('../../plugin') {
         console.log(`using Maven archetype version ${archetypeVersion}`)
 
         const temp = await mkdtemp(join(os.tmpdir(), `${path.basename(cds.root)}_`))
+        // preserve existing package.json (if any)
+        let preservedPackageJsonPath
+        if (exists('package.json')) {
+            preservedPackageJsonPath = join(temp, 'package.json')
+            await copy('package.json').to(preservedPackageJsonPath)
+        }
         try {
             await cmd.spawnCommand('mvn', params, { cwd: temp })
             await copy(join(temp, artifactId)).to(cds.root)
+            if (preservedPackageJsonPath) {
+                // merge template package.json into preserved one
+                // (not the other way around)
+                // to give preserved values precedence
+                await merge('package.json').into(preservedPackageJsonPath)
+                await copy(preservedPackageJsonPath).to('package.json')
+            }
         } catch (err) {
             if (err.code === 'ENOENT' && err.path === 'mvn') {
                 throw `Maven executable 'mvn' not found. Follow ${info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`

package/lib/init/template/kafka/index.js

@@ -4,6 +4,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, kafkaMessaging } = require('../../registries/mta')
 const mvn = require('../../mvn')
+const KymaTemplate = require('../kyma')
 
 module.exports = class KafkaTemplate extends require('../../plugin') {
 
@@ -28,7 +29,7 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, srvPath, addHelm, addHelmUnifiedRuntime } = project
+    const { addMta, srvPath, addKyma } = project
 
     if (addMta) {
       const srv = srv4(srvPath)
@@ -42,8 +43,9 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
       })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
+      await KymaTemplate.mergeDependency("service-instance", "kafka")
     }
   }
 }

package/lib/init/template/kyma/index.js

@@ -1,23 +1,134 @@
-const cds = require('../../../../lib/cds')
+const { join } = require('path')
+const cds = require('../../../cds')
+const { exists, rimraf, copy, yaml } = cds.utils
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
+const { ask4 } = require('../../../util/question')
+const { execSync } = require('child_process')
+const { mvn } = require('../../add')
 
-module.exports = class extends require('../../plugin') {
+module.exports = class KymaTemplate extends require('../../plugin') {
 
-    static help() {
-      return 'Kyma deployment using Helm charts'
+    static hasInProduction() {
+        return exists('chart/Chart.yaml')
     }
 
-    options() {
-      return {
-        'unified-runtime': {
-          type: 'boolean'
-        }
+  async canRun() {
+    const hasInProduction = KymaTemplate.hasInProduction()
+    if (cds.cli.options.force) {
+      await rimraf(join('chart'))
+      await rimraf('containerize.yaml')
+      return true
+    } else if (hasInProduction) {
+      throw `Chart already exists. Use --force to overwrite.`
+    }
+    return true
+  }
+
+  static help() {
+    return 'Kyma deployment using Helm charts'
+  }
+
+  async run() {
+    const project = readProject()
+
+    let imagePullSecret, registry, domain, tag
+    if (!KymaTemplate.hasInProduction() && !project.isBas /* don't run this for the BAS Yeoman generator */) {
+      try {
+        const domainGuess = execSync(`kubectl config view --minify --output jsonpath="{.clusters[*].cluster.server}"`, { stdio: "pipe" }).toString()
+        const domainStartIndex = domainGuess.indexOf('api.')
+        if (domainStartIndex !== -1) domain = domainGuess.substring(domainStartIndex + 4)
+      } catch (error) { /* ignore */ }
+
+      //REVISIT: remove cds10 
+      if (exists('containerize.yaml')) {
+        const { repository: r, tag: t } = yaml.parse(join(cds.root, 'containerize.yaml'))
+        if (r) registry = r
+        if (t) tag = t
+      }
+      if (!cds.cli.options.y && !cds.cli.options.force) {
+        registry ??= await ask4([`registry server: `])
+        domain ??= await ask4([`cluster domain: `])
+      }
+    }
+    project.registry = registry ?? '<registry-server>'
+    project.domain = domain ?? '<cluster-domain>'
+    project.imagePullSecret = imagePullSecret ?? 'docker-registry'
+    project.tag = tag ?? 'latest'
+    await copy(join(__dirname, 'files', 'values.schema.json')).to('chart/values.schema.json')
+    await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { with: project })
+    await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
+    await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project })
+    await KymaTemplate.mergeDependency('web-application', 'srv')
+    if (project.isJava) await mvn.add('k8s')
+
+  }
+
+  options() {
+    return {
+      'unified-runtime': {
+        type: 'boolean'
+      },
+      'y': {
+        type: 'boolean',
       }
     }
+  }
 
-    requires() {
-      if (cds.cli.options['unified-runtime']) {
-        return ['helm-unified-runtime', 'containerize']
+  async combine() {
+    // REVISIT: This must be moved to the respective plugins
+    const {
+      addHana, addMultitenancy, addXsuaa,
+      addApprouter, addIas, addAms, hasXsuaa, hasMultitenancy,
+      addHtml5Repo, hasHtml5Repo,
+    } = readProject()
+
+    if (addHtml5Repo || addApprouter && hasHtml5Repo) {
+      if (addHtml5Repo) {
+        await KymaTemplate.mergeDependency('service-instance', 'html5-apps-repo-host')
+        await KymaTemplate.mergeDependency('content-deployment', 'html5-apps-deployer')
+      }
+      if (addApprouter) {
+        await KymaTemplate.mergeDependency('service-instance', 'html5-apps-repo-runtime')
+      }
+    }
+    if (addMultitenancy || addXsuaa || addIas || addAms) {
+      if (addMultitenancy) {
+        await KymaTemplate.mergeDependency('web-application', 'sidecar')
+      }
+      if (hasXsuaa && hasMultitenancy) {
+        await KymaTemplate.mergeDependency('service-instance', 'saas-registry')
+      } else if (hasMultitenancy) {
+        await KymaTemplate.mergeDependency('service-instance', 'subscription-manager')
       }
-      return ['helm', 'containerize']
     }
+    if (addHana || addMultitenancy) {
+      if (hasMultitenancy) {
+        await KymaTemplate.mergeDependency('service-instance', 'service-manager')
+      } else {
+        await KymaTemplate.mergeDependency('service-instance', 'hana')
+        await KymaTemplate.mergeDependency('content-deployment', 'hana-deployer')
+      }
+    }
+  }
+
+  static async mergeDependency(name, alias) {
+    const project = readProject()
+
+    await merge({
+      dependencies: [{
+        name,
+        alias,
+        version: '>0.0.0',
+        ...((cds.cli.options["unified-runtime"] || project.hasHelmUnifiedRuntime) && { repository: 'https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz' })
+      }]
+    }).into('chart/Chart.yaml', {
+      with: project,
+      additions: [{
+        in: 'dependencies',
+        where: { alias }
+      }]}
+    )
+
+  }
 }

package/lib/init/template/malware-scanner/index.js

@@ -1,6 +1,7 @@
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, malwareScanner } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class MalwareScannerTemplate extends require('../../plugin') {
 
@@ -22,7 +23,7 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMta, addHelm, addHelmUnifiedRuntime, srvPath } = project
+        const { addMta, addKyma, srvPath } = project
 
         if (addMta) {
             const srv = srv4(srvPath)
@@ -36,8 +37,9 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
             })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
+            await KymaTemplate.mergeDependency('service-instance', 'malware-scanner')
         }
     }
 }

package/lib/init/template/mta/index.js

@@ -1,7 +1,7 @@
 const cds = require('../../../cds')
 const { exists } = cds.utils
-const { bold } = require('../../../util/term')
 const { readProject } = require('../../projectReader')
+const { bold } = require('../../../util/term')
 const { merge, sort } = require('../../merge')
 const { mvn } = require('../../add')
 

package/lib/init/template/multitenancy/index.js

@@ -30,6 +30,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
     if (isJava) {
       const packageJson = await read('package.json')
       packageJson.workspaces = ['mtx/sidecar']
+      packageJson.devDependencies ??= {}
       packageJson.devDependencies['@sap/cds-mtxs'] ??= '^3'
       await write('package.json', packageJson, { spaces: 2 })
       await sort('package.json', 'devDependencies')
@@ -42,8 +43,8 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
   async combine() {
     const project = readProject()
     const {
-      isNodejs, isJava, addMta, hasMta, addHelm, addHelmUnifiedRuntime,
-      addXsuaa, hasXsuaa, addIas, hasIas, hasHana, addContainerize, hasApprouter,
+      isNodejs, isJava, addMta, hasMta,
+      addXsuaa, hasXsuaa, addIas, hasIas, hasHana, addContainerize, addKyma, addHelm, addHelmUnifiedRuntime, hasApprouter,
       srvPath, appName
     } = project
 
@@ -83,7 +84,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       await merge(templateMtaPath).into('mta.yaml', { with: project, additions, relationships })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
       const applicationWorkload = hasApprouter ? 'approuter' : 'srv'
       await merge({
@@ -99,7 +100,9 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       }).into('chart/values.yaml',{ forceOverwrite: true })
     }
 
-    if (addContainerize) {
+    // cds10 move to if above
+    // needed because of adding kyma to cli options in case of helm
+    if (addContainerize || (addKyma && !addHelm && !addHelmUnifiedRuntime)) {
       const deletions = []
       if (hasHana) {
         deletions.push({

package/lib/init/template/nodejs/files/.vscode/extensions.json

@@ -5,8 +5,5 @@
 		"mechatroner.rainbow-csv",
 		"qwtel.sqlite-viewer",
 		"humao.rest-client"
-	],
-	"unwantedRecommendations": [
-
 	]
 }

package/lib/init/template/pipeline/files/ui5.yaml.hbs

@@ -17,6 +17,7 @@ builder:
       afterTask: generateVersionInfo
       configuration:
         archiveName: {{app}}
+        relativePaths: true
         additionalFiles:
           - xs-app.json
     {{#isTypescript}}

package/lib/init/template/portal/index.js

@@ -4,6 +4,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, portal, portalDeployer, xsuaa, html5RepoHost, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
 const { renderAndCopy } = require('../../template')
+const KymaTemplate = require('../kyma')
 
 module.exports = class PortalTemplate extends require('../../plugin') {
 
@@ -28,7 +29,7 @@ module.exports = class PortalTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { appName, isJava, addMta, hasMta, srvPath, addHtml5Repo, addXsuaa, addApprouter, addMultitenancy, addHelm, addHelmUnifiedRuntime, addContainerize, hasApprouter, hasHtml5Repo, hasMultitenancy, hasXsuaa } = project
+    const { appName, isJava, addMta, hasMta, srvPath, addHtml5Repo, addXsuaa, addApprouter, addMultitenancy, addKyma, addContainerize, hasApprouter, hasHtml5Repo, hasMultitenancy, hasXsuaa } = project
 
     if (addMultitenancy) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
@@ -77,7 +78,7 @@ module.exports = class PortalTemplate extends require('../../plugin') {
       })
     }
 
-    if (addContainerize) {
+    if (addContainerize || addKyma) {
       const additions = [{
           in: 'modules',
           where: { name: `${appName}-portal-deployer` }
@@ -85,8 +86,10 @@ module.exports = class PortalTemplate extends require('../../plugin') {
       await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
+      await KymaTemplate.mergeDependency('service-instance', 'portal')
+      await KymaTemplate.mergeDependency('content-deployment', 'portal-deployer')
     }
   }
 }

package/lib/init/template/postgres/index.js

@@ -12,8 +12,8 @@ module.exports = class PostgresTemplate extends require('../../plugin') {
   }
 
   async canRun() {
-    const { hasMta, hasHelm, hasHelmUnifiedRuntime } = readProject()
-    if ((hasHelm || hasHelmUnifiedRuntime) && !hasMta) throw `'cds add postgres' is not available for Kyma yet`
+    const { hasMta, hasKyma } = readProject()
+    if (hasKyma && !hasMta) throw `'cds add postgres' is not available for Kyma yet`
     return true
   }
 

package/lib/init/template/redis/index.js

@@ -9,10 +9,9 @@ module.exports = class extends require('../../plugin') {
   }
 
   async canRun() {
-    const { hasMta, hasHelm, hasHelmUnifiedRuntime, isJava } = readProject()
-    const onlyHelm = !hasMta && (hasHelmUnifiedRuntime || hasHelm)
+    const { hasMta, hasKyma, isJava } = readProject()
     if (isJava)   throw `'cds add redis' is not available for Java yet`
-    if (onlyHelm) throw `'cds add redis' is not available for Kyma yet`
+    if (hasKyma && !hasMta) throw `'cds add redis' is not available for Kyma yet`
     return true
   }
 

package/lib/init/template/redis-messaging/index.js

@@ -14,10 +14,9 @@ module.exports = class RedisMessagingTemplate extends require('../../plugin') {
   }
 
   async canRun() {
-    const { hasMta, hasHelm, hasHelmUnifiedRuntime, isJava } = readProject()
-    const onlyHelm = !hasMta && (hasHelmUnifiedRuntime || hasHelm)
+    const { hasMta, hasKyma, isJava } = readProject()
     if (isJava)   throw `'cds add redis-messaging' is not available for Java yet`
-    if (onlyHelm) throw `'cds add redis-messaging' is not available for Kyma yet`
+    if (hasKyma && !hasMta) throw `'cds add redis-messaging' is not available for Kyma yet`
     return true
   }
 

package/lib/init/template/sample/files/_i18n/i18n_de.properties

@@ -1,5 +1,6 @@
 Books = Bücher
 Book = Buch
+ID = ID
 Title = Titel
 Description = Beschreibung
 Stock = Bestand
@@ -10,3 +11,11 @@ Currency = Währung
 Authors = Autoren
 Author = Autor
 AuthorID = ID des Autors
+Name = Name
+DateOfBirth = Geburtsort
+DateOfDeath = Todesdatum
+PlaceOfBirth = Geburtsort
+PlaceOfDeath = Todesort
+
+Genres = Genre
+Genre = Genre

package/lib/init/template/sample/files/_i18n/i18n_fr.properties

@@ -1,5 +1,6 @@
 Books = Livres
 Book = Livre
+ID = ID
 Title = Titre
 Description = Description
 Stock = Action

package/lib/init/template/sample/files/app/_i18n/i18n.properties

@@ -0,0 +1,17 @@
+Age = Age
+Lifetime = Lifetime
+
+Details = Details
+SubGenres = Subgenres
+
+NumCode = Numeric Code
+MinorUnit = Minor Unit
+Exponent = Exponent
+
+General = General
+Translations = Translations
+Admin = Administrator
+Languages = Languages
+
+Extended = Extended
+Currencies = Currencies

package/lib/init/template/sample/files/app/_i18n/i18n_de.properties

@@ -1,3 +1,17 @@
-AuthorName = Name des Autors
 Age = Alter
-Price = Preis
+Lifetime = Lebenszeitraum
+
+Details = Details
+SubGenres = Subgenres
+
+NumCode = Numeric Code
+MinorUnit = Minor Unit
+Exponent = Exponent
+
+General = Allgemein
+Translations = Übersetzungen
+Admin = Administrator
+Languages = Sprachen
+
+Extended = Erweitert
+Currencies = Währungen

package/lib/init/template/sample/files/app/admin-authors/webapp/i18n/i18n.properties

@@ -1,11 +1,3 @@
-# This is the resource bundle of itelo
-# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
-
-# JCI app descriptor contains lower case TITLE
-appTitle=Manage Authors
-
-# JCI app descriptor contains lower case DESCRIPTION
-appSubTitle=CAP Sample Application
-
-# JCI app descriptor contains lower case DESCRIPTION
-appDescription=Bookshop Authors
+appTitle = Manage Authors
+appSubTitle = CAP Sample Application
+appDescription = CAP Sample Application to Manage Authors

package/lib/init/template/sample/files/app/admin-authors/webapp/i18n/i18n_de.properties

@@ -0,0 +1,3 @@
+appTitle = Verwalte Autoren
+appSubTitle = CAP Beispielanwendung
+appDescription = CAP Beispielanwendung zur Verwaltung von Autoren

package/lib/init/template/sample/files/app/admin-authors/webapp/i18n/i18n_en.properties

@@ -0,0 +1,3 @@
+appTitle = Manage Authors
+appSubTitle = CAP Sample Application
+appDescription = CAP Sample Application to Manage Authors

package/lib/init/template/sample/files/app/admin-authors/webapp/manifest.json

@@ -32,7 +32,7 @@
           "semanticObject": "Authors",
           "action": "manage",
           "title": "{{appTitle}}",
-          "info": "{{appInfo}}",
+          "info": "{{appDescription}}",
           "subTitle": "{{appSubTitle}}",
           "icon": "sap-icon://SAP-icons-TNT/user",
           "indicatorDataSource": {

package/lib/init/template/sample/files/app/admin-books/webapp/i18n/i18n.properties

@@ -1,11 +1,3 @@
-# This is the resource bundle of itelo
-# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
-
-# JCI app descriptor contains lower case TITLE
-appTitle=Manage Books
-
-# JCI app descriptor contains lower case DESCRIPTION
-appSubTitle=CAP Sample Application
-
-# JCI app descriptor contains lower case DESCRIPTION
-appDescription=CDS Sample Service
+appTitle = Manage Books
+appSubTitle = CAP Sample Application
+appDescription = CAP Sample Application to Manage Books

package/lib/init/template/sample/files/app/admin-books/webapp/i18n/i18n_de.properties

@@ -0,0 +1,3 @@
+appTitle = Verwalte Bücher
+appSubTitle = CAP Beispielanwendung
+appDescription = CAP Beispielanwendung zur Verwaltung von Büchern

package/lib/init/template/sample/files/app/admin-books/webapp/i18n/i18n_en.properties

@@ -0,0 +1,3 @@
+appTitle = Manage Books
+appSubTitle = CAP Sample Application
+appDescription = CAP Sample Application to Manage Books

package/lib/init/template/sample/files/app/admin-books/webapp/manifest.json

@@ -28,7 +28,7 @@
           "semanticObject": "Books",
           "action": "manage",
           "title": "{{appTitle}}",
-          "info": "{{appInfo}}",
+          "info": "{{appDescription}}",
           "subTitle": "{{appSubTitle}}",
           "icon": "sap-icon://course-book"
         }

package/lib/init/template/sample/files/app/appconfig/fioriSandboxConfig.json

@@ -84,14 +84,14 @@
               },
               "resolutionResult": {
                 "applicationType": "SAPUI5",
-                "additionalInformation": "SAPUI5.Component=bookshop",
+                "additionalInformation": "SAPUI5.Component=bookshop.browse",
                 "url": "/browse/webapp"
               }
             },
-            "BrowseAuthors": {
+            "ManageAuthors": {
               "semanticObject": "Authors",
               "action": "manage",
-              "title": "Browse Authors",
+              "title": "Manage Authors",
               "signature": {
                 "parameters": {
                   "Books.author.ID":{
@@ -102,7 +102,7 @@
               },
               "resolutionResult": {
                 "applicationType": "SAPUI5",
-                "additionalInformation": "SAPUI5.Component=authors",
+                "additionalInformation": "SAPUI5.Component=bookshop.admin-authors",
                 "url": "/admin-authors/webapp"
               }
             },
@@ -120,7 +120,7 @@
               },
               "resolutionResult": {
                 "applicationType": "SAPUI5",
-                "additionalInformation": "SAPUI5.Component=genres",
+                "additionalInformation": "SAPUI5.Component=bookshop.genres",
                 "url": "/genres/webapp"
               }
             },
@@ -134,7 +134,7 @@
               },
               "resolutionResult": {
                 "applicationType": "SAPUI5",
-                "additionalInformation": "SAPUI5.Component=books",
+                "additionalInformation": "SAPUI5.Component=bookshop.admin-books",
                 "url": "/admin-books/webapp"
               }
             }

package/lib/init/template/sample/files/app/browse/webapp/i18n/i18n.properties

@@ -1,11 +1,3 @@
-# This is the resource bundle of itelo
-# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
-
-# JCI app descriptor contains lower case TITLE
-appTitle=Browse Books
-
-# JCI app descriptor contains lower case DESCRIPTION
-appSubTitle=CAP Sample Application
-
-# JCI app descriptor contains lower case DESCRIPTION
-appDescription=CDS Sample Service
+appTitle = Browse Books
+appSubTitle = CAP Sample Application
+appDescription = CAP Sample Application to Browse Books