Merge pull request #4 from ttsokov/master

Use MTA reference to resource property "~{hdi-container-name}"
SAP-archive · Nov 20, 2018 · fa7b7d2 · fa7b7d2
2 parents 0dad113 + 2300c57
commit fa7b7d2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -134,8 +134,7 @@ $ # The response should be `HTTP: 404`
 ```
 
 # Known Issues
-* Currently there is one backend module implemented in Java. In future will be provided more backend modules implemented in different languages, like Node.js, Python, etc. 
-* References in module properties in the MTA deployment descriptors are currently not used. They will be used in future.
+* Currently there is one backend module implemented in Java. In future will be provided more backend modules implemented in different languages, like Node.js, Python, etc.
 
 # How to obtain support
 If you need any support, have any question or have found a bug, please report it in the [GitHub bug tracking system](https://github.com/SAP/cloud-hdi-zdm-reference-app/issues).

diff --git a/cloud-hdi-zdm-ref-app.blue/mta-jee/mta.yaml b/cloud-hdi-zdm-ref-app.blue/mta-jee/mta.yaml
@@ -8,13 +8,14 @@ modules:
     path: ../cloud-hdi-zdm-ref-app.backend.jee.blue
     properties:
       TARGET_RUNTIME: tomee
-      JBP_CONFIG_RESOURCE_CONFIGURATION: "[tomee/webapps/ROOT/WEB-INF/resources.xml: {service_name_for_DefaultDB : hdi-container}]"
       SET_LOGGING_LEVEL: "{OpenEJB: DEBUG, OpenEJB.options: DEBUG, OpenEJB.server: DEBUG, OpenEJB.startup: DEBUG, OpenEJB.startup.service: DEBUG, OpenEJB.startup.config: DEBUG, OpenEJB.hsql: DEBUG, openjpa.Tool: DEBUG, openjpa.Runtime: INFO, openjpa.Remote: DEBUG, openjpa.DataCache: DEBUG, openjpa.MetaData: DEBUG, openjpa.Enhance: DEBUG, openjpa.Query: DEBUG, openjpa.jdbc.SQL: DEBUG, openjpa.jdbc.SQLDiag: DEBUG, openjpa.jdbc.JDBC: DEBUG, openjpa.jdbc.Schema: DEBUG}"
     parameters:
       disk-quota: 256M
       buildpack: sap_java_buildpack
     requires:
       - name: hdi-container
+        properties:
+          JBP_CONFIG_RESOURCE_CONFIGURATION: "[tomee/webapps/ROOT/WEB-INF/resources.xml: {service_name_for_DefaultDB : ~{hdi-container-name}}]"
       - name: db
 
   - name: db
@@ -28,4 +29,6 @@ modules:
 
 resources:
   - name: hdi-container
+    properties:
+      hdi-container-name: ${service-name}
     type: com.sap.xs.hdi-container
diff --git a/cloud-hdi-zdm-ref-app.green/mta-jee/mta.yaml b/cloud-hdi-zdm-ref-app.green/mta-jee/mta.yaml
@@ -8,13 +8,14 @@ modules:
     path: ../cloud-hdi-zdm-ref-app.backend.jee.green
     properties:
       TARGET_RUNTIME: tomee
-      JBP_CONFIG_RESOURCE_CONFIGURATION: "[tomee/webapps/ROOT/WEB-INF/resources.xml: {service_name_for_DefaultDB : hdi-container}]"
       SET_LOGGING_LEVEL: "{OpenEJB: DEBUG, OpenEJB.options: DEBUG, OpenEJB.server: DEBUG, OpenEJB.startup: DEBUG, OpenEJB.startup.service: DEBUG, OpenEJB.startup.config: DEBUG, OpenEJB.hsql: DEBUG, openjpa.Tool: DEBUG, openjpa.Runtime: INFO, openjpa.Remote: DEBUG, openjpa.DataCache: DEBUG, openjpa.MetaData: DEBUG, openjpa.Enhance: DEBUG, openjpa.Query: DEBUG, openjpa.jdbc.SQL: DEBUG, openjpa.jdbc.SQLDiag: DEBUG, openjpa.jdbc.JDBC: DEBUG, openjpa.jdbc.Schema: DEBUG}"
     parameters:
       disk-quota: 256M
       buildpack: sap_java_buildpack
     requires:
       - name: hdi-container
+        properties:
+          JBP_CONFIG_RESOURCE_CONFIGURATION: "[tomee/webapps/ROOT/WEB-INF/resources.xml: {service_name_for_DefaultDB : ~{hdi-container-name}}]"
       - name: db
 
   - name: db
@@ -28,4 +29,6 @@ modules:
 
 resources:
   - name: hdi-container
+    properties:
+      hdi-container-name: ${service-name}
     type: com.sap.xs.hdi-container
diff --git a/mtad.yaml b/mtad.yaml
@@ -5,22 +5,27 @@ version: 0.0.1
 modules:
   - name: backend
     type: java.tomee
-    path: cloud-hdi-zdm-ref-app.backend/target/cloud-hdi-zdm-ref-app-backend.war
     parameters:
       buildpack: sap_java_buildpack
+      disk-quota: 256M
     properties:
-      JBP_CONFIG_RESOURCE_CONFIGURATION: "['tomee/webapps/ROOT/WEB-INF/resources.xml': {'service_name_for_DefaultDB' : 'hdi-container'}]"
-      SET_LOGGING_LEVEL: "{OpenEJB: DEBUG, OpenEJB.options: DEBUG, OpenEJB.server: DEBUG, OpenEJB.startup: DEBUG, OpenEJB.startup.service: DEBUG, OpenEJB.startup.config: DEBUG, OpenEJB.hsql: DEBUG, openjpa.Tool: DEBUG, openjpa.Runtime: INFO, openjpa.Remote: DEBUG, openjpa.DataCache: DEBUG, openjpa.MetaData: DEBUG, openjpa.Enhance: DEBUG, openjpa.Query: DEBUG, openjpa.jdbc.SQL: DEBUG, openjpa.jdbc.SQLDiag: DEBUG, openjpa.jdbc.JDBC: DEBUG, openjpa.jdbc.Schema: DEBUG}"
+      SET_LOGGING_LEVEL: '{OpenEJB: DEBUG, OpenEJB.options: DEBUG, OpenEJB.server: DEBUG, OpenEJB.startup: DEBUG, OpenEJB.startup.service: DEBUG, OpenEJB.startup.config: DEBUG, OpenEJB.hsql: DEBUG, openjpa.Tool: DEBUG, openjpa.Runtime: INFO, openjpa.Remote: DEBUG, openjpa.DataCache: DEBUG, openjpa.MetaData: DEBUG, openjpa.Enhance: DEBUG, openjpa.Query: DEBUG, openjpa.jdbc.SQL: DEBUG, openjpa.jdbc.SQLDiag: DEBUG, openjpa.jdbc.JDBC: DEBUG, openjpa.jdbc.Schema: DEBUG}'
     requires:
       - name: hdi-container
+        properties:
+          JBP_CONFIG_RESOURCE_CONFIGURATION: '[tomee/webapps/ROOT/WEB-INF/resources.xml: {service_name_for_DefaultDB : ~{hdi-container-name}}]'
       - name: db
 
   - name: db
     type: com.sap.xs.hdi
-    path: cloud-hdi-zdm-ref-app.db/
+    parameters:
+      memory: 256M
+      disk-quota: 256M
     requires:
       - name: hdi-container
 
 resources:
   - name: hdi-container
+    properties:
+      hdi-container-name: ${service-name}
     type: com.sap.xs.hdi-container