@sap/cds-dk 7.9.6 → 8.0.3

package/lib/init/mvn.js

@@ -1,179 +1,132 @@
+const util = require('util')
+const { exec } = require('child_process')
+const execAsync = util.promisify(exec)
 
-const { URLS, MAVEN_ARCHETYPE_VERSION, OPTIONS: { JAVA_MVN, JAVA_PACKAGE, HANA }, REGEX_JAVA_PACKAGE } = require('./constants');
+const term = require('../util/term')
+const cmd = require('../util/command')
 
-const cp = require('child_process');
-const util = require('util');
-const execAsync = util.promisify(cp.exec);
-const term = require('../util/term');
-const cmd = require('../util/command');
-
-const DEFAULT_GROUP_ID = 'customer';
-
-const LOG = console
 const cds = require('../cds')
-const DEBUG = cds.debug('cli')
-
-class MvnArchetypeUtil {
-
-    _scanMvnParams(mvnParams, params) {
-        // need to create new regex every call since a constant
-        // would keep the match state
-
-        const quoteRegex = /([\w\-.]+)=([\w\-.]+|\[([\w.\-,]+)\])/g;
-        // captures a=1         => a:1
-        //          -Da=[x,y,z] => -Da:x,y,z (Maven specific)
-        //          a=[x,y,z]   => a:x,y,z
-
-        let match = quoteRegex.exec(mvnParams);
-        while (match != null) {
-            const key = (match[1].startsWith('-D') ? match[1] : `-D${match[1]}`);
-            params.set(key, match[3] || match[2]);
-            match = quoteRegex.exec(mvnParams);
-        }
-    }
-
-    _finalize(params) {
-        params.set(`-Dstyle.color`, `always`);
-
-        params.set('-B');
-
-        if (DEBUG) {
-            params.set('-X'); params.set('-e');
-        }
-        if (process.env.CI) {
-            params.set('--batch-mode');
-        }
-
-        return Array.from(params, ([arg, val]) => val !== null && val !== undefined ? `${arg}=${val}` : arg)
-    }
+const DEBUG = cds.debug('cli|init|add|mvn')
 
-    // REVISIT: make this only public API once mvn:addSample etc. have been moved to generic mvn:add
-    async add(feature) {
-        return this.execMvn(this.getAddArgs(feature))
-    }
+const { URLS, MAVEN_ARCHETYPE_VERSION, OPTIONS: { JAVA_PACKAGE, HANA }, REGEX_JAVA_PACKAGE } = require('./constants')
 
-    getAddArgs(feature) {
-        const params = new Map();
+module.exports.add = async function (feature) {
+    const params = new Map()
 
-        params.set(`com.sap.cds:cds-maven-plugin:${MAVEN_ARCHETYPE_VERSION}:add`);
+    const { 'java:mvn': javaMvn, force } = cds.cli.options
+    if (javaMvn) _scan(javaMvn).forEach(([k,v]) => params.set(k,v))
+    const archetypeVersion = params.get('-DarchetypeVersion') ?? MAVEN_ARCHETYPE_VERSION
+    if (feature === HANA) { // REVISIT: compat for HANA when -Dfeature HANA is provided by Java
+        params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:addTargetPlatform`)
+        params.set(`-DtargetPlatform`, `cloudfoundry`) // REVISIT: No special handling for HANA
+    } else {
+        params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:add`)
         params.set(`-Dfeature`, feature)
         const profile = cds.cli.options.for
         params.set(`-Dprofile`, profile === 'production' ? 'cloud' : profile ?? 'default')
-
-        const { options } = cds.cli
-        if (options[JAVA_MVN]) {
-            this._scanMvnParams(options[JAVA_MVN], params);
-        }
-
-        if (options.force) {
-            params.set(`-Doverwrite`, true);
-        }
-
-        return this._finalize(params);
     }
 
-    getAddHanaCmdArgs() {
-        const params = new Map();
-
-        params.set(`com.sap.cds:cds-maven-plugin:${MAVEN_ARCHETYPE_VERSION}:addTargetPlatform`);
-        params.set(`-DtargetPlatform`, `cloudfoundry`);
-
-        const javaMvn = cds.cli.options[JAVA_MVN]
-        if (javaMvn) {
-            this._scanMvnParams(javaMvn, params);
+    if (force) params.set(`-Doverwrite`, true)
+    try {
+        await cmd.spawnCommand('mvn', _finalize(params), { cwd: cds.root })
+    } catch (err) {
+        if (err.code === 'ENOENT' && err.path === 'mvn') {
+            throw `Maven executable 'mvn' not found. Follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`
         }
-
-        return this._finalize(params);
-    }
-
-    sanitizePackageName(packageName) {
-        return packageName.toLowerCase().replace(/-/g, '_').replace(/\.([0-9])/g, '._$1').replace(/^([0-9])/, '_$1').replace(/\.+/g, '.');
+        throw err
     }
+}
 
-    async getGenerateCmdArgs(projectName, options = cds.cli.options) {
-        const params = new Map();
+module.exports.init = async function (projectName, options = cds.cli.options) {
+    const params = new Map()
 
-        // set header
-        params.set(`archetype:generate`);
-        params.set(`-DarchetypeArtifactId`, `cds-services-archetype`);
-        params.set(`-DarchetypeGroupId`, `com.sap.cds`);
-        params.set(`-DarchetypeVersion`, MAVEN_ARCHETYPE_VERSION);
-        params.set('-DinteractiveMode', false);
+    // set header
+    params.set(`archetype:generate`);
+    params.set(`-DarchetypeArtifactId`, `cds-services-archetype`);
+    params.set(`-DarchetypeGroupId`, `com.sap.cds`);
+    params.set(`-DarchetypeVersion`, MAVEN_ARCHETYPE_VERSION);
+    params.set('-DinteractiveMode', false);
 
-        // set defaults, might be changed by java:mvn param
-        params.set(`-DartifactId`, projectName);
-        params.set(`-DgroupId`, DEFAULT_GROUP_ID);
+    // set defaults, might be changed by java:mvn param
+    params.set(`-DartifactId`, projectName);
+    params.set(`-DgroupId`, 'customer');
 
-        const hasHana = !!(options.add && options.add.has(HANA));
-        if (hasHana) {
-            params.set(`-DtargetPlatform`, `cloudfoundry`);
-        }
+    const { 'java:mvn': javaMvn } = options
+    if (javaMvn) _scan(javaMvn).forEach(([k,v]) => params.set(k,v))
 
-        if (options[JAVA_MVN]) {
-            this._scanMvnParams(options[JAVA_MVN], params);
+    // -DjdkVersion=[11|17]
+    if (!params.get('-DjdkVersion')) {
+        let javaVersion
+        try {
+            javaVersion = await execAsync('java -version');
+        } catch (err) {
+            DEBUG?.(err);
         }
-
-        // -DjdkVersion=[11|17]
-        if (!params.get('-DjdkVersion')) {
-            let javaVersion
-            try {
-                javaVersion = await execAsync('java -version');
-            } catch (err) {
-                DEBUG?.(err);
-            }
-            const [,version] = javaVersion?.stderr?.match(/version\s*"?(\d+\.\d+\.\d+)"?/) ?? [];
-            if (version) {
-                const [major] = version.split('.').map(Number);
-                if (major < 17) {
-                    if (process.env.WS_BASE_URL) {
-                        throw `Java version ${version} is not supported. Use Java 17 or higher. You can use command 'Java: Set Default JDK' to switch to Java 17.`
-                    }
-                    throw `Java version ${version} is not supported. Use Java 17 or higher.`
+        const [,version] = javaVersion?.stderr?.match(/version\s*"?(\d+\.\d+\.\d+)"?/) ?? [];
+        if (version) {
+            const [major] = version.split('.').map(Number);
+            if (major < 17) {
+                if (process.env.WS_BASE_URL) {
+                    throw `Java version ${version} is not supported. Use Java 17 or higher. You can use command 'Java: Set Default JDK' to switch to Java 17.`
                 }
+                throw `Java version ${version} is not supported. Use Java 17 or higher.`
             }
         }
+    }
 
-        if (options[JAVA_PACKAGE]) {
-            params.set(`-Dpackage`, options[JAVA_PACKAGE]);
-        }
-
-        const artifactId = params.get('-DartifactId');
-
-        const packageFromParam = params.get(`-Dpackage`);
-        if (packageFromParam) {
-            // explicitly specified, so do not modify
-            if (!options.force && !packageFromParam.match(REGEX_JAVA_PACKAGE)) {
-                throw `Package '${packageFromParam}' is an invalid Java package name. Use --force to use it anyway.`
-            }
-        } else {
-            // potentially overwritten by mvn param
-            const groupId = params.get(`-DgroupId`);
-            let packageName = `${groupId}.${projectName}`;
-
-            if (!packageName.match(REGEX_JAVA_PACKAGE)) {
-                packageName = this.sanitizePackageName(packageName);
-                LOG.warn(`The derived package name '${groupId}.${projectName}' is not a valid Java package name. Using '${packageName}' instead.`);
-            }
-            params.set(`-Dpackage`, packageName);
-        }
-
-        return {
-            cmdLine: this._finalize(params),
-            archetypeVersion: params.get('-DarchetypeVersion'),
-            artifactId
-        };
+    if (options[JAVA_PACKAGE]) {
+        params.set(`-Dpackage`, options[JAVA_PACKAGE]);
     }
 
-    async execMvn(args) {
-        try {
-            await cmd.spawnCommand('mvn', args, { cwd: cds.root });
-        } catch (err) {
-            if (err.code === 'ENOENT' && err.path === 'mvn') {
-                throw `Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`;
-            }
-            throw err;
+    const packageFromParam = params.get(`-Dpackage`);
+    if (packageFromParam) {
+        // explicitly specified, so do not modify
+        if (!options.force && !packageFromParam.match(REGEX_JAVA_PACKAGE)) {
+            throw `Package '${packageFromParam}' is an invalid Java package name. Use --force to use it anyway.`
+        }
+    } else {
+        // potentially overwritten by mvn param
+        const groupId = params.get(`-DgroupId`);
+        let packageName = `${groupId}.${projectName}`;
+
+        if (!packageName.match(REGEX_JAVA_PACKAGE)) {
+            packageName = sanitize(packageName);
+            console.warn(`The derived package name '${groupId}.${projectName}' is not a valid Java package name. Using '${packageName}' instead.`);
         }
+        params.set(`-Dpackage`, packageName);
     }
+
+    const artifactId = params.get('-DartifactId')
+    const archetypeVersion = params.get('-DarchetypeVersion')
+    return { params: _finalize(params), archetypeVersion, artifactId }
 }
 
-module.exports = new MvnArchetypeUtil();
+const sanitize = module.exports.sanitize = name => name
+    .toLowerCase()
+    .replace(/-/g, '_')
+    .replace(/\.([0-9])/g, '._$1')
+    .replace(/^([0-9])/, '_$1')
+    .replace(/\.+/g, '.')
+
+function _scan(mvnParams) {
+    // need to create new regex every call since a constant
+    // would keep the match state
+    // captures a=1         => a:1
+    //          -Da=[x,y,z] => -Da:x,y,z (Maven specific)
+    //          a=[x,y,z]   => a:x,y,z
+    const quoteRegex = /([\w\-.]+)=([\w\-.]+|\[([\w.\-,]+)\])/g
+    return [...mvnParams.matchAll(quoteRegex)].map(([,key,value,listValues]) => {
+        key = key.startsWith('-D') ? key : `-D${key}`
+        return [key, listValues || value]
+    })
+}
+
+function _finalize(params) {
+    params.set(`-Dstyle.color`, `always`)
+    if (DEBUG) params.set('-X')
+    if (DEBUG) params.set('-e')
+    if (process.env.CI) params.set('--batch-mode')
+    const final = Array.from(params, ([arg, val]) => val !== null && val !== undefined ? `${arg}=${val}` : arg)
+    DEBUG?.(term.highlight('mvn' + final.join(' ')))
+    return final
+}

package/lib/init/plugin.js

@@ -1,8 +1,7 @@
 const { join } = require('path')
 const cds = require('../cds')
 const { readdir } = cds.utils
-const DEBUG = cds.debug('add')
-const { env4 } = require('./projectReader')
+const DEBUG = cds.debug('cli|add')
 
 module.exports = class Plugin {
 
@@ -28,13 +27,20 @@ module.exports = class Plugin {
      */
     async canRun() { return true }
 
+    /**
+     * Gets a brief help text for the plugin.
+     * Displayed when all plugins are listed with `cds add`.
+     * @returns {string} The help text.
+     */
+    static help() { return '' }
+
     /**
      * Determines if the plugin has already been added to the project.
      * @param {import('@sap/cds').env} env - The env for the 'production' profile.
      * @returns {boolean} - Returns `true` if the template has been added, otherwise `false`.
      */
     static hasInProduction(env) { // eslint-disable-line no-unused-vars
-        return false
+        return true
     }
 
     /**
@@ -48,9 +54,6 @@ module.exports = class Plugin {
     async combine() { }
 
 
-
-
-
     /* ––––––––––––
        Yeoman Generator
        –––––––––––– */
@@ -58,7 +61,7 @@ module.exports = class Plugin {
     /**
      * Runs the finalize operations.
      */
-    async finalize() { } // REVISIT: Required for yo-generator, check if needed any more?
+    async finalize() { }
 
     /* ––––––––––––
        Private APIs
@@ -69,6 +72,7 @@ module.exports = class Plugin {
         DEBUG && console.log('Plugins active for production:')
         const fromDk = await readdir(join(__dirname, './template'))
         const { registered } = require('./add')
+        const { env4 } = require('./projectReader')
         const processPlugins = async (plugins) => {
             for (const plugin of plugins) {
                 const Plugin = registered.get(plugin) ?? require('./template/' + plugin)

package/lib/init/projectReader.js

@@ -9,7 +9,9 @@ module.exports = new class ProjectReader {
 
     constructor() {
         this.readProject = this.readProject.bind(this)
+    }
 
+    #setPackageInfo() {
         // 1. Use project name and static default values
         this.appVersion = cds.cli.options.add?.has('java') ? '1.0.0-SNAPSHOT' : '1.0.0'
         this.appName = this.appId = basename(cds.root)
@@ -39,7 +41,6 @@ module.exports = new class ProjectReader {
         }
     }
 
-    // REVISIT: There should an API provided by cds.env
     /**
      * Returns cds.env using 'production' profile by default as mta deployment is executed with having production profile set.
      */
@@ -69,6 +70,8 @@ module.exports = new class ProjectReader {
      * @property {boolean} hasUIEmbedded Indicates if the project uses an embedded UI.
      * @property {boolean} hasUIModule Indicates if the project is using a modular UI.
      * @property {boolean} hasUI Indicates if the project has a UI.
+     * @property {boolean} hasUI5 Indicates if the project is a UI5 project.
+     * @property {boolean} isUI5 Indicates if the project is a UI5 project.
      * @property {boolean} isJava Indicates if the project is using Java.
      * @property {boolean} isNodejs Indicates if the project is using Node.js.
      * @property {boolean} hasHelmUnifiedRuntime Indicates if the project uses Unified Runtime Helm deployment.
@@ -82,9 +85,14 @@ module.exports = new class ProjectReader {
      * @property {boolean} hasHana Indicates if the project uses HANA.
      * @property {boolean} hasPostgres Indicates if the project uses PostgreSQL.
      * @property {boolean} hasEnterpriseMessaging Indicates if the project uses SAP BTP Event Mesh.
+     * @property {boolean} hasAttachments Indicates if the project uses SAP BTP Object Store Service.
      * @property {boolean} hasApprouter Indicates if the project uses the SAP Application Router.
      * @property {boolean} hasHtml5Repo Indicates if the project uses the SAP BTP HTML5 Application Repository.
+     * @property {boolean} hasPortal Indicates if the project uses the SAP Cloud Portal serivce.
      * @property {boolean} hasDestination Indicates if the project uses the SAP BTP Destination service.
+     * @property {boolean} hasMTXRoute Indicates if the approuter should have a multitenant route.
+     * @property {boolean} hasMTXRouteJava Indicates if the approuter should have a multitenant subscription route (java).
+     * @property {boolean} hasMalwareScanner Indicates if the project uses the SAP Malware Scanning service.
      *
      */
 
@@ -95,22 +103,30 @@ module.exports = new class ProjectReader {
      * @returns {ProjectConfig} An object representing the project configuration.
      */
     readProject() {
+        if (!this.appName) this.#setPackageInfo()
         const env = this.env4('production')
         const { appVersion, appName, appId, appDescription, jdkVersion } = this
         DEBUG?.({ env })
 
         const _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env)
+        const _ui5 = () => exists('package.json') && !!JSON.parse(fs.readFileSync(path.resolve(cds.root, 'package.json'))).sapux
+        const _uiEmbedded = () => exists(join(env.folders.app, 'xs-app.json'))
+        const _uiModule = () => !_uiEmbedded() && isdir(env.folders.app) && fs.readdirSync(resolve(cds.root, env.folders.app)).length > 0
+        const _isJava = () => exists('pom.xml') || cds.cli.options?.add?.has('java')
+        const isApp = name => name !== 'appconfig' && !name.startsWith('_') && name !== 'router' && name !== 'portal'
         const reserved = {
             has: x => _inProd(x),
             shortcut: () => true,
             profile: () => cds.cli.options?.for,
             language: () => exists('pom.xml') ? 'java' : 'nodejs',
-            isJava: () => exists('pom.xml') || cds.cli.options?.add?.has('java'),
-            isNodejs: () => !exists('pom.xml') && !cds.cli.options?.add?.has('java'),
+            isJava: () => _isJava(),
+            isNodejs: () => !_isJava(),
             srvPath: () => join(env.build.target, env.folders.srv.replace(/\/$/, '')).replace(/\\/g, '/'),
             archiveName: () => {
-                const pom = parseXml(resolve(cds.root, env.folders.srv, 'pom.xml'))
-                return (pom?.artifactId?.[0] ?? basename(cds.root)) + '-exec.' + pom?.packaging?.[0]
+                const pomXmlPath = resolve(cds.root, env.folders.srv, 'pom.xml')
+                const pom = exists(pomXmlPath) ? parseXml(pomXmlPath) : {}
+                const { artifactId = [basename(cds.root)], packaging = ['jar'] } = pom
+                return artifactId[0] + '-exec.' + packaging[0]
             },
             db: () => {
                 const folder = env.folders.db
@@ -119,27 +135,51 @@ module.exports = new class ProjectReader {
                 return { folder, name, path }
             },
             configFile: () => exists('pom.xml') ? '.cdsrc.json' : 'package.json',
-            apps: () => (fs.readdirSync(path.resolve(cds.root, cds.env.folders.app))).filter(e =>
-                isdir(join(cds.root, cds.env.folders.app, e)) && e !== 'appconfig' && e !== '_i18n' && e !== 'router'
-            ).map(app => ({ app })),
+            apps: () => {
+                const apps = fs.readdirSync(path.resolve(cds.root, cds.env.folders.app)).filter(e =>
+                    isdir(path.join(cds.root, cds.env.folders.app, e)) && isApp(e)
+                )
+                return apps.map((app, i) => {
+                    const manifestPath = path.resolve(cds.root, cds.env.folders.app, app, 'webapp/manifest.json')
+                    const manifest = exists(manifestPath) ? JSON.parse(fs.readFileSync(manifestPath, 'utf-8')) : {}
+                    const inbounds = manifest?.['sap.app']?.crossNavigation?.inbounds
+                    const [firstInbound] = Object.values(inbounds ?? { intent: { semanticObject: 'Books', action: 'display' }})
+                    const vizId = firstInbound.semanticObject + '-' + firstInbound.action
+                    return { app, strippedApp: app.replace(/-/g, ''), vizId, isNotLast: i < apps.length - 1 }
+                })
+            },
             appUIPaths: () => (fs.readdirSync(path.resolve(cds.root, cds.env.folders.app))).filter(e =>
-                isdir(join(cds.root, cds.env.folders.app, e)) && e !== 'appconfig' && e !== '_i18n' && e !== 'router'
+                isdir(join(cds.root, cds.env.folders.app, e)) && isApp(e)
             ),
             appPath: () => env.folders.app,
             appVersion: () => appVersion,
             jdkVersion: () => jdkVersion,
-            approuterPath: () => join(env.folders.app, 'router'),
+            approuterPath: () => _uiEmbedded() ? join(env.folders.app) : join(env.folders.app, 'router'),
             appName: () => appName,
             cleanedAppName: () => appName.replaceAll('_', '-'),
+            strippedAppName: () => appName.replace(/-/g, ''),
             appId: () => appId,
             appDescription: () => appDescription,
-            hasUIEmbedded: () => exists(join(env.folders.app, 'xs-app.json')),
-            hasUIModule: () => !this.hasUIEmbedded && isdir(env.folders.app) && fs.readdirSync(resolve(cds.root, env.folders.app)).length > 0,
-            hasUI: () => this.hasUIEmbedded || this.hasUIModule
+            hasUIEmbedded: _uiEmbedded,
+            hasUIModule: _uiModule,
+            hasUI: () => _uiEmbedded() || _uiModule(),
+            isUI5: _ui5,
+            hasUI5: _ui5,
+            hasMTXRoute: () => _inProd('extensibility') || (_inProd('multitenancy') && !_isJava()),
+            hasMTXRouteJava: () => (_inProd('helm-unified-runtime') || _inProd('helm')) && _isJava() && _inProd('multitenancy'),
         }
 
+        // Automatically creates availability checks for `cds add` commands.
+        // Maps to the `hasInProduction` implemented in the command.
+        // E.g. `cds add hana` can be checked using `hasHana` or `isHana`
         const project = (() => {
             const defined = {}
+            const _get = property => { const p = property
+                if (p in reserved) return reserved[p]()
+                for (const prefix of ['has', 'is']) if (p.startsWith(prefix) && p.length > prefix.length) {
+                    return _inProd(p.slice(prefix.length).replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase())
+                }
+            }
             return new Proxy({}, {
                 get(_, p) { return _get(p) ?? defined[p] },
                 set(_, p, value) { defined[p] = value; return true },
@@ -147,13 +187,6 @@ module.exports = new class ProjectReader {
             })
         })()
 
-        const _get = property => { const p = property
-            if (p in reserved) return reserved[p]()
-            for (const prefix of ['has', 'is']) if (p.startsWith(prefix) && p.length > prefix.length) {
-                return _inProd(p.slice(prefix.length).replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase())
-            }
-        }
-
         DEBUG?.({ project })
         return project
     }

package/lib/init/registries/mta.js

@@ -3,7 +3,10 @@ const cds = require('../../cds')
 
 const srvNode4 = path => ({ in: 'modules', where: { type: 'nodejs', path } })
 const srvJava4 = path => ({ in: 'modules', where: { type: 'java', path } })
-const srv4 = cds.env['project-nature'] === 'java' || cds.cli.options?.add?.has('java') ? srvJava4 : srvNode4
+
+// REVISIT: Clean up
+const isJava = process.argv[process.argv.indexOf('--add') + 1].split(',').includes('java') || cds.env['project-nature'] === 'java' || cds.cli.options?.add?.has('java')
+const srv4 = isJava ? srvJava4 : srvNode4
 
 const approuter = { in: 'modules', where: { type: 'approuter.nodejs' } }
 
@@ -17,6 +20,11 @@ const destination = {
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'destination' }
 }
 
+const destinations = {
+    in: 'modules',
+    where: { type: 'com.sap.application.content', 'build-parameters.no-source': true }
+}
+
 const connectivity = {
     in: 'resources',
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'connectivity' }
@@ -42,6 +50,16 @@ const applicationLogging = {
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'application-logs' }
 }
 
+const attachments = {
+    in: 'resources',
+    where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'objectstore' }
+}
+
+const malwareScanner = {
+    in: 'resources',
+    where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'malware-scanner' }
+}
+
 const hdbDeployer = {
     in: 'modules',
     where: { type: 'hdb' }
@@ -122,11 +140,16 @@ const providedJavaApprouterApi = {
     where: { 'properties.url': '${default-url}' }
 }
 
-const approuterExtensibility = {
+const approuterMTXRoute = {
     in: 'routes',
     where: { source: '^/-/cds/.*', destination: 'mtx-api', authenticationType: 'none' }
 }
 
+const approuterMTXRouteJava = {
+    in: 'routes',
+    where: { source: '^/mt/.*', destination: 'srv-api', authenticationType: 'none' }
+}
+
 const html5RepoHost = {
     in: 'resources',
     where: { 'parameters.service': 'html5-apps-repo', 'parameters.service-plan': 'app-host' }
@@ -137,9 +160,24 @@ const html5Runtime = {
     where: { 'parameters.service': 'html5-apps-repo', 'parameters.service-plan': 'app-runtime' }
 }
 
-const appContent = {
+const appDeployer = {
     in: 'modules',
-    where: { type: 'com.sap.application.content' }
+    where: { type: 'com.sap.application.content', path: isJava ? '.' : 'gen' }
+}
+
+const portal = {
+    in: 'resources',
+    where: { 'parameters.service': 'portal' },
+}
+
+const portalDeployer = {
+    in: 'modules',
+    where: { type: 'com.sap.application.content', path: 'app/portal' }
+}
+
+const auditlog = {
+    in: 'resources',
+    where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'auditlog' }
 }
 
 module.exports = {
@@ -147,6 +185,7 @@ module.exports = {
     approuter,
     xsuaa,
     destination,
+    destinations,
     connectivity,
     enterpriseMessaging,
     kafkaMessaging,
@@ -168,8 +207,14 @@ module.exports = {
     providedJavaApprouterApi4,
     providedJavaApprouterApi,
     applicationLogging,
-    approuterExtensibility,
+    approuterMTXRoute,
+    approuterMTXRouteJava,
     html5RepoHost,
     html5Runtime,
-    appContent
+    appDeployer,
+    portal,
+    portalDeployer,
+    auditlog,
+    attachments,
+    malwareScanner,
 }

package/lib/init/template/application-logging/files/package.json.hbs

@@ -0,0 +1,7 @@
+{
+  "cds": {
+    "requires": {
+      "application-logging": true
+    }
+  }
+}

package/lib/init/template/application-logging/index.js

@@ -4,8 +4,12 @@ const { srv4, mtxSidecar4, applicationLogging, approuter } = require('../../regi
 
 module.exports = class ApplicationLoggingTemplate extends require('../../plugin') {
 
+    static help() {
+        return 'SAP BTP Application Logging Service'
+    }
+
     static hasInProduction(env) {
-        return !!env.features.kibana_formatter
+        return !!env.requires?.['application-logging']
     }
 
     async canRun() {
@@ -14,6 +18,14 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
         return true
     }
 
+    async run() {
+        const project = readProject()
+        const { isNodejs } = project
+        if (isNodejs) {
+            await merge(__dirname, 'files/package.json.hbs').into('package.json')
+        }
+    }
+
     async combine() {
         const project = readProject()
         const { hasMta, hasApprouter, isJava, hasMultitenancy, srvPath } = project

package/lib/init/template/approuter/files/containerize.yaml.hbs

@@ -0,0 +1,10 @@
+---
+modules:
+  - name: {{appName}}-approuter
+    build-parameters:
+      buildpack:
+        type: nodejs
+        builder: builder-jammy-base
+        path: app/router
+        env:
+          BP_NODE_RUN_SCRIPTS: ""

package/lib/init/template/approuter/files/mta.yaml.hbs

@@ -61,8 +61,7 @@ modules:
   {{#hasMultitenancy}}
   - name: {{appName}}-mtx
     type: nodejs
-    path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
-    {{#isNodejs}}
+    path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar{{#isNodejs}}
     requires:
       - name: app-api
         properties: