Skip to content

Commit 89d0c56

Browse files
juancadavidjuancadavid
committed
Bump version to 0.5.12 and fix templates
1 parent ba64193 commit 89d0c56

File tree

8 files changed

+63
-27
lines changed

8 files changed

+63
-27
lines changed

‎.classpath‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<attribute name="maven.pomderived" value="true"/>
2020
</attributes>
2121
</classpathentry>
22-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
2323
<attributes>
2424
<attribute name="maven.pomderived" value="true"/>
2525
</attributes>
@@ -36,5 +36,22 @@
3636
<attribute name="optional" value="true"/>
3737
</attributes>
3838
</classpathentry>
39+
<classpathentry kind="src" path="target/generated-sources/annotations">
40+
<attributes>
41+
<attribute name="optional" value="true"/>
42+
<attribute name="maven.pomderived" value="true"/>
43+
<attribute name="ignore_optional_problems" value="true"/>
44+
<attribute name="m2e-apt" value="true"/>
45+
</attributes>
46+
</classpathentry>
47+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
48+
<attributes>
49+
<attribute name="optional" value="true"/>
50+
<attribute name="maven.pomderived" value="true"/>
51+
<attribute name="ignore_optional_problems" value="true"/>
52+
<attribute name="m2e-apt" value="true"/>
53+
<attribute name="test" value="true"/>
54+
</attributes>
55+
</classpathentry>
3956
<classpathentry kind="output" path="target/classes"/>
4057
</classpath>

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
eclipse.preferences.version=1
2-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
3-
org.eclipse.jdt.core.compiler.compliance=11
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
3+
org.eclipse.jdt.core.compiler.compliance=1.8
44
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
55
org.eclipse.jdt.core.compiler.debug.localVariable=generate
66
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
1111
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
1212
org.eclipse.jdt.core.compiler.processAnnotations=disabled
1313
org.eclipse.jdt.core.compiler.release=enabled
14-
org.eclipse.jdt.core.compiler.source=11
14+
org.eclipse.jdt.core.compiler.source=1.8

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "automatic"
3+
}

‎ToscaDesigner/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<attribute name="maven.pomderived" value="true"/>
2020
</attributes>
2121
</classpathentry>
22-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
2323
<attributes>
2424
<attribute name="maven.pomderived" value="true"/>
2525
</attributes>

‎ToscaDesigner/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- definition -->
88
<groupId>fr.softeam</groupId>
99
<artifactId>toscadesigner</artifactId>
10-
<version>0.5.3</version>
10+
<version>0.5.12</version>
1111
<name>ToscaDesigner</name>
1212

1313
<description>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- definition -->
88
<groupId>fr.softeam</groupId>
99
<artifactId>toscadesigner</artifactId>
10-
<version>0.5.3</version>
10+
<version>0.5.12</version>
1111
<name>ToscaDesigner</name>
1212

1313
<description>
@@ -40,7 +40,7 @@ This module typically provides a graphical user interface (GUI) or integrated de
4040
<dependency>
4141
<groupId>org.modelio</groupId>
4242
<artifactId>MDAKit</artifactId>
43-
<version>[5.4.1,5.4.2)</version>
43+
<version>[6.1,6.2)</version>
4444
<type>pom</type>
4545
<scope>provided</scope>
4646
</dependency>

‎src/main/conf/module.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<Module id="ToscaDesigner" class="fr.softeam.toscadesigner.impl.ToscaDesignerModule" binaryversion="6.1.01" version="0.1.0" schema-level="2" uid="942db9f9-6869-472c-b269-9ca7ec36a014" author="Softeam" image="" url="">
2+
<Module id="ToscaDesigner" class="fr.softeam.toscadesigner.impl.ToscaDesignerModule" binaryversion="6.1.01" version="0.5.12" schema-level="2" uid="942db9f9-6869-472c-b269-9ca7ec36a014" author="Softeam" image="" url="">
33
<ClassPath>
44
<PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
55
<PathEntry path="lib/handlebars-4.3.1.jar"/>

‎src/main/resources/fr/softeam/templates/TTopologyTemplate.hbs‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,53 @@
1+
{{!-- Template: TTopologyTemplate.hbs
2+
Notes: cleaned stray fence markers and added null-safe partial invocation guards.
3+
--}}
4+
15
{{#unless (noStereotypeApplications this "Metadata")}}metadata:{{/unless}}
2-
{{#each ownedAttribute}}{{#extension}}{{#eq name "Metadata"}}
3-
{{../name}}: "{{../value}}"
4-
{{/eq}}{{/extension}}{{/each}}
6+
{{#each ownedAttribute}}
7+
{{#extension}}{{#eq name "Metadata"}}
8+
{{../name}}: "{{../value}}"
9+
{{/eq}}{{/extension}}
10+
{{/each}}
511
{{imports this}}
12+
613
topology_template:
14+
715
{{#unless (noStereotypeApplications this "InputParametersType")}}
816
inputs:
9-
{{#ownedElement}}{{#extension}}{{#eq name "InputParametersType"}}{{#ownedAttribute}}{{#extension}}{{#eq name "TParameter"}}
10-
{{> (lookup this.name) ../this}}
11-
{{/eq}}{{/extension}}{{/ownedAttribute}}{{/eq}}{{/extension}}{{/ownedElement}}
17+
{{#ownedElement}}{{#extension}}{{#eq name "InputParametersType"}}
18+
{{#ownedAttribute}}{{#with this as |parameter|}}{{#extension}}{{#eq name "TParameter"}}
19+
{{> TParameter parameter}}
20+
{{/eq}}{{/extension}}{{/with}}{{/ownedAttribute}}
21+
{{/eq}}{{/extension}}{{/ownedElement}}
1222
{{/unless}}
23+
1324
{{#unless (noStereotypeApplications this "TNodeTemplate")}}
1425
node_templates:
15-
{{#ownedElement}}{{#extension}}{{#eq name "TNodeTemplate"}}
16-
{{> (lookup this.name) ../this}}
17-
{{/eq}}{{/extension}}{{/ownedElement}}
26+
{{#ownedElement}}{{#with this as |nodeTemplate|}}{{#extension}}{{#eq name "TNodeTemplate"}}
27+
{{> TNodeTemplate nodeTemplate}}
28+
{{/eq}}{{/extension}}{{/with}}{{/ownedElement}}
1829
{{/unless}}
30+
1931
{{#unless (noStereotypeApplications this "TGroup")}}
20-
groups:
21-
{{#ownedElement}}{{#extension}}{{#eq name "TGroup"}}
22-
{{> (lookup this.name) ../this}}
23-
{{/eq}}{{/extension}}{{/ownedElement}}
32+
groups:
33+
{{#ownedElement}}{{#with this as |group|}}{{#extension}}{{#eq name "TGroup"}}
34+
{{> TGroup group}}
35+
{{/eq}}{{/extension}}{{/with}}{{/ownedElement}}
2436
{{/unless}}
37+
2538
{{#unless (noStereotypeApplications this "TRelationshipTemplateEnd")}}
2639
relationship_templates:
27-
{{#ownedElement}}{{#targetingEnd}}{{#association}}{{#extension}}{{#eq name "TRelationshipTemplate"}}
40+
{{#ownedElement}}{{#targetingEnd}}{{#association}}{{#extension}}{{#eq name "TRelationshipTemplate"}}
2841
{{../name}}:
2942
type: {{getProperty ../this "type"}}
30-
{{/eq}}{{/extension}}{{/association}}{{/targetingEnd}}{{/ownedElement}}
43+
{{/eq}}{{/extension}}{{/association}}{{/targetingEnd}}{{/ownedElement}}
3144
{{/unless}}
45+
3246
{{#unless (noStereotypeApplications this "PoliciesType")}}
3347
policies:
34-
{{#ownedElement}}{{#extension}}{{#eq name "PoliciesType"}}{{#ownedElement}}{{#extension}}{{#eq name "TPolicy"}}
35-
{{> (lookup this.name) ../this}}
36-
{{/eq}}{{/extension}}{{/ownedElement}}{{/eq}}{{/extension}}{{/ownedElement}}
48+
{{#ownedElement}}{{#extension}}{{#eq name "PoliciesType"}}
49+
{{#ownedElement}}{{#with this as |policy|}}{{#extension}}{{#eq name "TPolicy"}}
50+
{{> TPolicy policy}}
51+
{{/eq}}{{/extension}}{{/with}}{{/ownedElement}}
52+
{{/eq}}{{/extension}}{{/ownedElement}}
3753
{{/unless}}

0 commit comments

Comments
 (0)