Fix NodeJS type

UST-EDMM · Mar 4, 2021 · 896cfee · 896cfee
1 parent be8befe
commit 896cfee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/...lates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fartifacttemplates/NodeJS-Start/files/start.sh b/...lates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fartifacttemplates/NodeJS-Start/files/start.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-/usr/local/bin/npm start
+npm start
 exit 0
diff --git a/...https%3A%2F%2Fedmm.uni-stuttgart.de%2Fartifacttemplates/SpringBoot-Create/files/create.sh b/...https%3A%2F%2Fedmm.uni-stuttgart.de%2Fartifacttemplates/SpringBoot-Create/files/create.sh
@@ -2,5 +2,5 @@
 apt -y update
 apt -y install openjdk-11-jre-headless
 file_name=$(find . -type f -name '*.jar')
-cp file_name ./app.jar
+cp $file_name ./app.jar
 exit 0
diff --git a/nodetypes/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fnodetypes/NodeJS/NodeType.tosca b/nodetypes/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fnodetypes/NodeJS/NodeType.tosca
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Definitions xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" xmlns:winery="http://www.opentosca.org/winery/extensions/tosca/2013/02/12" xmlns:selfservice="http://www.eclipse.org/winery/model/selfservice" xmlns:testwineryopentoscaorg="http://test.winery.opentosca.org" targetNamespace="https://edmm.uni-stuttgart.de/nodetypes" id="winery-defs-for_ntyIgeneral-NodeJS">
     <NodeType name="NodeJS" abstract="no" final="no" targetNamespace="https://edmm.uni-stuttgart.de/nodetypes">
-        <DerivedFrom xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" typeRef="ntyIgeneral:Software_Component"/>
+        <DerivedFrom xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" typeRef="ntyIgeneral:Web_Server"/>
         <Interfaces>
             <Interface name="http://opentosca.org/interfaces/lifecycle">
                 <Operation name="create"/>

diff --git a/...tes/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/SockShop/ServiceTemplate.tosca b/...tes/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/SockShop/ServiceTemplate.tosca
@@ -2,7 +2,7 @@
 <Definitions xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" xmlns:winery="http://www.opentosca.org/winery/extensions/tosca/2013/02/12" xmlns:selfservice="http://www.eclipse.org/winery/model/selfservice" xmlns:testwineryopentoscaorg="http://test.winery.opentosca.org" targetNamespace="https://edmm.uni-stuttgart.de/servicetemplates" id="winery-defs-for_steIgeneral2-SockShop">
     <ServiceTemplate name="SockShop" targetNamespace="https://edmm.uni-stuttgart.de/servicetemplates" id="SockShop">
         <TopologyTemplate>
-            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="compute" minInstances="1" maxInstances="1" type="ntyIgeneral:Compute" id="Compute_0" winery:x="418" winery:y="390">
+            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="compute" minInstances="1" maxInstances="1" type="ntyIgeneral:Compute" id="Compute_0" winery:x="419" winery:y="475">
                 <Properties>
                     <Properties xmlns="http://www.example.org">
                         <os_family>linux</os_family>
@@ -14,11 +14,16 @@
                 </Properties>
             </NodeTemplate>
             <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="front-end" minInstances="1" maxInstances="1" type="ntyIgeneral:NodeJS" id="NodeJS_0" winery:x="418" winery:y="114">
+                <Properties>
+                    <properties xmlns="https://edmm.uni-stuttgart.de/nodetypes/propertiesdefinition/winery">
+                        <port>8080</port>
+                    </properties>
+                </Properties>
                 <DeploymentArtifacts>
                     <DeploymentArtifact xmlns:atyIgeneral="https://edmm.uni-stuttgart.de/artifacttypes" xmlns:ateIgeneral1="https://edmm.uni-stuttgart.de/artifacttemplates" name="src" artifactType="atyIgeneral:Archive" artifactRef="ateIgeneral1:SockShop-Frontend"/>
                 </DeploymentArtifacts>
             </NodeTemplate>
-            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="payment" minInstances="1" maxInstances="1" type="ntyIgeneral:Go" id="Go_0" winery:x="836" winery:y="219">
+            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="payment" minInstances="1" maxInstances="1" type="ntyIgeneral:Go" id="Go_0" winery:x="847" winery:y="201">
                 <Properties>
                     <Properties xmlns="http://www.example.org">
                         <workdir>github.com/microservices-demo/payment</workdir>
@@ -30,7 +35,7 @@
                     <DeploymentArtifact xmlns:atyIgeneral="https://edmm.uni-stuttgart.de/artifacttypes" xmlns:ateIgeneral1="https://edmm.uni-stuttgart.de/artifacttemplates" name="src" artifactType="atyIgeneral:Archive" artifactRef="ateIgeneral1:SockShop-Payment"/>
                 </DeploymentArtifacts>
             </NodeTemplate>
-            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="compute" minInstances="1" maxInstances="1" type="ntyIgeneral:Compute" id="Compute_1" winery:x="838" winery:y="393">
+            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="compute" minInstances="1" maxInstances="1" type="ntyIgeneral:Compute" id="Compute_1" winery:x="843" winery:y="471">
                 <Properties>
                     <Properties xmlns="http://www.example.org">
                         <os_family>linux</os_family>
@@ -41,7 +46,7 @@
                     </Properties>
                 </Properties>
             </NodeTemplate>
-            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="shipping" minInstances="1" maxInstances="1" type="ntyIgeneral:SpringBoot" id="SpringBoot_0" winery:x="1178" winery:y="109">
+            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="shipping" minInstances="1" maxInstances="1" type="ntyIgeneral:SpringBoot" id="SpringBoot_0" winery:x="1182" winery:y="92">
                 <Properties>
                     <properties xmlns="https://edmm.uni-stuttgart.de/nodetypes/propertiesdefinition/winery">
                         <port>8080</port>
@@ -51,7 +56,7 @@
                     <DeploymentArtifact xmlns:atyIgeneral="https://edmm.uni-stuttgart.de/artifacttypes" xmlns:ateIgeneral1="https://edmm.uni-stuttgart.de/artifacttemplates" name="jar" artifactType="atyIgeneral:JAR" artifactRef="ateIgeneral1:SockShop-Shipping"/>
                 </DeploymentArtifacts>
             </NodeTemplate>
-            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="compute" minInstances="1" maxInstances="1" type="ntyIgeneral:Compute" id="Compute_2" winery:x="1178" winery:y="297">
+            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="compute" minInstances="1" maxInstances="1" type="ntyIgeneral:Compute" id="Compute_2" winery:x="1174" winery:y="459">
                 <Properties>
                     <properties xmlns="https://edmm.uni-stuttgart.de/nodetypes/propertiesdefinition/winery">
                         <os_family>linux</os_family>