Skip to content

Commit 067dcc2

Browse files
juancadavidjuancadavid
committed
Merge remote-tracking branch 'origin/ToscaProfile' into toscaCodeGen
2 parents 5ca6b50 + b0f2cfe commit 067dcc2

File tree

205 files changed

+14096
-3169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+14096
-3169
lines changed

‎ToscaDesigner/Generated TOSCA files/MyrtusFace_Application.tosca‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ topology_template:
8484
- host:
8585
node: Myrtus_Workstation_1
8686
relationship: con_HostedOn_1
87-
capability:
87+
capability: host
8888

8989

9090

‎ToscaDesigner/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@
3636
<scope>provided</scope>
3737
</dependency>
3838

39-
<dependency>
39+
<dependency>
4040
<groupId>com.github.jknack</groupId>
4141
<artifactId>handlebars</artifactId>
4242
<version>4.3.1</version>
4343
<type>jar</type>
4444
</dependency>
45+
4546
</dependencies>
4647

4748
<!-- // Build // -->

‎ToscaDesigner/src/main/conf/module.properties‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,22 @@ propertydefinition.TDefinitionTable.targetNamespace.description=
151151
propertydefinition.TDefinitionTable.targetNamespace.label=targetNamespace
152152
propertydefinition.TDefinitionTable.types.description=
153153
propertydefinition.TDefinitionTable.types.label=types
154-
propertydefinition.TDeploymentArtifactTable.Deploy_path.description=
155-
propertydefinition.TDeploymentArtifactTable.Deploy_path.label=Deploy_path
156-
propertydefinition.TDeploymentArtifactTable.File.description=
157-
propertydefinition.TDeploymentArtifactTable.File.label=File
158-
propertydefinition.TDeploymentArtifactTable.artifactType.description=
159-
propertydefinition.TDeploymentArtifactTable.artifactType.label=artifactType
160-
propertydefinition.TDeploymentArtifactTable.artifactref.description=
161-
propertydefinition.TDeploymentArtifactTable.artifactref.label=artifactref
154+
propertydefinition.TDeploymentArtifactTable.artifact_version.description=
155+
propertydefinition.TDeploymentArtifactTable.artifact_version.label=artifact_version
156+
propertydefinition.TDeploymentArtifactTable.checksum.description=
157+
propertydefinition.TDeploymentArtifactTable.checksum.label=checksum
158+
propertydefinition.TDeploymentArtifactTable.checksum_algortihm.description=
159+
propertydefinition.TDeploymentArtifactTable.checksum_algortihm.label=checksum_algortihm
160+
propertydefinition.TDeploymentArtifactTable.deploy_path.description=
161+
propertydefinition.TDeploymentArtifactTable.deploy_path.label=deploy_path
162+
propertydefinition.TDeploymentArtifactTable.description.description=
163+
propertydefinition.TDeploymentArtifactTable.description.label=description
164+
propertydefinition.TDeploymentArtifactTable.file.description=
165+
propertydefinition.TDeploymentArtifactTable.file.label=file
166+
propertydefinition.TDeploymentArtifactTable.repository.description=
167+
propertydefinition.TDeploymentArtifactTable.repository.label=repository
168+
propertydefinition.TDeploymentArtifactTable.type.description=
169+
propertydefinition.TDeploymentArtifactTable.type.label=type
162170
propertydefinition.TDocumentationTable.any.description=
163171
propertydefinition.TDocumentationTable.any.label=any
164172
propertydefinition.TDocumentationTable.lang.description=

‎ToscaDesigner/src/main/conf/module.xml‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
<Module id="ToscaDesigner" class="fr.softeam.toscadesigner.impl.ToscaDesignerModule" binaryversion="5.4.01" version="0.0.1" schema-level="2" uid="942db9f9-6869-472c-b269-9ca7ec36a014" author="Softeam" image="" url="">
33
<ClassPath>
44
<PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
5-
<PathEntry path="lib/commons-text-1.11.0.jar"/>
6-
<PathEntry path="lib/nashorn-core-15.4.jar"/>
7-
<PathEntry path="lib/asm-7.3.1.jar"/>
8-
<PathEntry path="lib/asm-commons-7.3.1.jar"/>
9-
<PathEntry path="lib/asm-analysis-7.3.1.jar"/>
10-
<PathEntry path="lib/asm-tree-7.3.1.jar"/>
11-
<PathEntry path="lib/asm-util-7.3.1.jar"/>
12-
<PathEntry path="lib/antlr4-runtime-4.5.1-1.jar"/>
13-
<PathEntry path="lib/commons-lang3-3.1.jar"/>
14-
<PathEntry path="lib/rhino-1.7R4.jar"/>
155
<PathEntry path="lib/handlebars-4.3.1.jar"/>
166
<PathEntry path="lib/slf4j-api-1.7.32.jar"/>
177
</ClassPath>
@@ -504,21 +494,37 @@
504494
<Icon path="res/icon/gui/deploymentArtifact24.png"/>
505495
<Image path="res/icon/gui/deploymentArtifact48.png"/>
506496
<PropertyTable id="TDeploymentArtifactTable" label="%propertytable.TDeploymentArtifactTable.label" uid="e1a47f10-7786-44c4-b602-5f8eb918638d">
507-
<PropertyDefinition id="artifactType" label="%propertydefinition.TDeploymentArtifactTable.artifactType.label" default-value="" is-editable="true" uid="11b2ec8c-7e88-4012-b051-c5ff3843b3d7">
497+
<PropertyDefinition id="type" label="%propertydefinition.TDeploymentArtifactTable.type.label" default-value="" is-editable="true" uid="11b2ec8c-7e88-4012-b051-c5ff3843b3d7">
508498
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
509-
<Description>%propertydefinition.TDeploymentArtifactTable.artifactType.description</Description>
499+
<Description>%propertydefinition.TDeploymentArtifactTable.type.description</Description>
510500
</PropertyDefinition>
511-
<PropertyDefinition id="artifactref" label="%propertydefinition.TDeploymentArtifactTable.artifactref.label" default-value="" is-editable="true" uid="7acf9bc4-9dc3-4663-8355-4368413f2578">
501+
<PropertyDefinition id="file" label="%propertydefinition.TDeploymentArtifactTable.file.label" default-value="" is-editable="true" uid="7acf9bc4-9dc3-4663-8355-4368413f2578">
512502
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
513-
<Description>%propertydefinition.TDeploymentArtifactTable.artifactref.description</Description>
503+
<Description>%propertydefinition.TDeploymentArtifactTable.file.description</Description>
514504
</PropertyDefinition>
515-
<PropertyDefinition id="File" label="%propertydefinition.TDeploymentArtifactTable.File.label" default-value="" is-editable="true" uid="198ef816-98ff-465e-af75-32bdb5f9da13">
505+
<PropertyDefinition id="repository" label="%propertydefinition.TDeploymentArtifactTable.repository.label" default-value="" is-editable="true" uid="198ef816-98ff-465e-af75-32bdb5f9da13">
516506
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
517-
<Description>%propertydefinition.TDeploymentArtifactTable.File.description</Description>
507+
<Description>%propertydefinition.TDeploymentArtifactTable.repository.description</Description>
518508
</PropertyDefinition>
519-
<PropertyDefinition id="Deploy_path" label="%propertydefinition.TDeploymentArtifactTable.Deploy_path.label" default-value="" is-editable="true" uid="be5a4c69-add9-4d4c-99cb-05a0a69359ba">
509+
<PropertyDefinition id="description" label="%propertydefinition.TDeploymentArtifactTable.description.label" default-value="" is-editable="true" uid="2fd370da-daeb-4519-9f06-967d3e3cb882">
520510
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
521-
<Description>%propertydefinition.TDeploymentArtifactTable.Deploy_path.description</Description>
511+
<Description>%propertydefinition.TDeploymentArtifactTable.description.description</Description>
512+
</PropertyDefinition>
513+
<PropertyDefinition id="deploy_path" label="%propertydefinition.TDeploymentArtifactTable.deploy_path.label" default-value="" is-editable="true" uid="c8fa55fe-6ff5-4ec5-9d1f-f32385091030">
514+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
515+
<Description>%propertydefinition.TDeploymentArtifactTable.deploy_path.description</Description>
516+
</PropertyDefinition>
517+
<PropertyDefinition id="artifact_version" label="%propertydefinition.TDeploymentArtifactTable.artifact_version.label" default-value="" is-editable="true" uid="1774043f-fb09-4265-bbe1-c43047c05ff7">
518+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
519+
<Description>%propertydefinition.TDeploymentArtifactTable.artifact_version.description</Description>
520+
</PropertyDefinition>
521+
<PropertyDefinition id="checksum" label="%propertydefinition.TDeploymentArtifactTable.checksum.label" default-value="" is-editable="true" uid="b7dc26ea-f4bf-4f9f-b847-cc89ba624530">
522+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
523+
<Description>%propertydefinition.TDeploymentArtifactTable.checksum.description</Description>
524+
</PropertyDefinition>
525+
<PropertyDefinition id="checksum_algortihm" label="%propertydefinition.TDeploymentArtifactTable.checksum_algortihm.label" default-value="" is-editable="true" uid="a0b664be-6ddd-4e45-8208-113c85c48101">
526+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
527+
<Description>%propertydefinition.TDeploymentArtifactTable.checksum_algortihm.description</Description>
522528
</PropertyDefinition>
523529
</PropertyTable>
524530
</Stereotype>
@@ -1050,8 +1056,8 @@
10501056
</Command>
10511057
<Command id="Export" label="%command.Export.label" tooltip="%command.Export.tooltip" image="res/icon/gui/export.png" modify-model="false">
10521058
<Scope metaclass="Standard.Package" stereotype="ToscaDesigner#ToscaModel"/>
1053-
<Scope metaclass="Infrastructure.ModelElement" stereotype="ToscaDesigner#TNodeType"/>
1054-
<Scope metaclass="Infrastructure.ModelElement" stereotype="ToscaDesigner#TTopologyTemplate"/>
1059+
<Scope metaclass="Standard.Class" stereotype="ToscaDesigner#TNodeType"/>
1060+
<Scope metaclass="Standard.Package" stereotype="ToscaDesigner#TTopologyTemplate"/>
10551061
<Handler class="fr.softeam.toscadesigner.handlers.commands.ExportToscaModelCommand">
10561062
<HParameter name="name" value=""/>
10571063
</Handler>
@@ -1126,6 +1132,7 @@
11261132
<Tool id="Metadata" label="%tool.Metadata.label" tooltip="%tool.Metadata.tooltip" image="res/icon/gui/metadata24.png">
11271133
<Scope-source metaclass="Standard.Package" stereotype="ToscaDesigner#TTopologyTemplate"/>
11281134
<Scope-source metaclass="Standard.Class" stereotype="ToscaDesigner#TNodeTemplate"/>
1135+
<Scope-source metaclass="Standard.Class" stereotype="ToscaDesigner#TNodeType"/>
11291136
<Handler class="Box">
11301137
<HParameter name="stereotype" value="ToscaDesigner#Metadata"/>
11311138
<HParameter name="metaclass" value="Standard.Attribute"/>

‎ToscaDesigner/src/main/conf/module_fr.properties‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,22 @@ propertydefinition.TDefinitionTable.targetNamespace.description=
151151
propertydefinition.TDefinitionTable.targetNamespace.label=targetNamespace
152152
propertydefinition.TDefinitionTable.types.description=
153153
propertydefinition.TDefinitionTable.types.label=types
154-
propertydefinition.TDeploymentArtifactTable.Deploy_path.description=
155-
propertydefinition.TDeploymentArtifactTable.Deploy_path.label=Deploy_path
156-
propertydefinition.TDeploymentArtifactTable.File.description=
157-
propertydefinition.TDeploymentArtifactTable.File.label=File
158-
propertydefinition.TDeploymentArtifactTable.artifactType.description=
159-
propertydefinition.TDeploymentArtifactTable.artifactType.label=artifactType
160-
propertydefinition.TDeploymentArtifactTable.artifactref.description=
161-
propertydefinition.TDeploymentArtifactTable.artifactref.label=artifactref
154+
propertydefinition.TDeploymentArtifactTable.artifact_version.description=
155+
propertydefinition.TDeploymentArtifactTable.artifact_version.label=artifact_version
156+
propertydefinition.TDeploymentArtifactTable.checksum.description=
157+
propertydefinition.TDeploymentArtifactTable.checksum.label=checksum
158+
propertydefinition.TDeploymentArtifactTable.checksum_algortihm.description=
159+
propertydefinition.TDeploymentArtifactTable.checksum_algortihm.label=checksum_algortihm
160+
propertydefinition.TDeploymentArtifactTable.deploy_path.description=
161+
propertydefinition.TDeploymentArtifactTable.deploy_path.label=deploy_path
162+
propertydefinition.TDeploymentArtifactTable.description.description=
163+
propertydefinition.TDeploymentArtifactTable.description.label=description
164+
propertydefinition.TDeploymentArtifactTable.file.description=
165+
propertydefinition.TDeploymentArtifactTable.file.label=file
166+
propertydefinition.TDeploymentArtifactTable.repository.description=
167+
propertydefinition.TDeploymentArtifactTable.repository.label=repository
168+
propertydefinition.TDeploymentArtifactTable.type.description=
169+
propertydefinition.TDeploymentArtifactTable.type.label=type
162170
propertydefinition.TDocumentationTable.any.description=
163171
propertydefinition.TDocumentationTable.any.label=any
164172
propertydefinition.TDocumentationTable.lang.description=

‎ToscaDesigner/src/main/conf/toscadesigner.ramc‎

557 Bytes
Binary file not shown.

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/IToscaDesignerPeerModule.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import com.modeliosoft.modelio.javadesigner.annotations.objid;
44
import org.modelio.api.module.IPeerModule;
55

6-
@objid ("5c7f53bd-3f13-46f6-844a-597e7d912a8f")
6+
@objid ("1dc24328-a397-490e-9df9-150f7b3f742f")
77
public interface IToscaDesignerPeerModule extends IPeerModule {
8-
@objid ("9d3d705b-21b6-4f57-9c6c-5547875049c5")
8+
@objid ("f937c7da-40c3-478c-b588-74b666fcecd9")
99
public static final String MODULE_NAME = "ToscaDesigner";
1010

11-
@objid ("35d4cbd5-1a65-4c86-abf7-07c1dcfecf0e")
11+
@objid ("bbeb78ba-dc64-4ac1-9085-5a559e18d7ca")
1212
public static final String TOSCA_STYLE = "ToscaStyle";
1313
}
1414

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/ToscaDesignerProxyFactory.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: GENERATED FILE - DO NOT EDIT
33
* Module: ToscaDesigner v0.0.1
44
5-
* This file was generated on 06/02/2025 17:32 by Modelio Studio.
5+
* This file was generated on 13/02/2025 17:54 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api;
88

@@ -124,18 +124,18 @@
124124
* <li><< CapabilityStereotype >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link CapabilityStereotype}
125125
* </ul>
126126
*/
127-
@objid ("f96166f4-8706-4930-8397-6424c7b3f767")
127+
@objid ("344538da-8f7b-4820-bee7-fad3a6c1b7e1")
128128
public class ToscaDesignerProxyFactory {
129-
@objid ("60615f82-fa20-4caa-8339-53e897876463")
129+
@objid ("4cb7f980-dc5b-4d18-ae1f-277f22822b9c")
130130
private static final String ASSETNAME = "ToscaDesigner";
131131

132-
@objid ("d6ad6708-77d8-48f6-b0ad-3e3ae493da1a")
132+
@objid ("3486d1ff-5d0f-4c4f-b500-10436237d693")
133133
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
134134

135135
/**
136136
* @param session The modeling session this factory is operating in.
137137
*/
138-
@objid ("be38c35b-1281-42cf-bece-12f0fd474864")
138+
@objid ("09f241df-a96a-40ce-a016-9ded81e4969e")
139139
public static final void initialize(final IModelingSession session) throws MdaProxyException {
140140
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram.MdaTypes.init(session);
141141
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.MdaTypes.init(session);
@@ -241,7 +241,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
241241
* @param e A model element
242242
* @return the right proxy or <i>null</i>.
243243
*/
244-
@objid ("72abba19-7d98-44eb-af8c-473435c029cc")
244+
@objid ("a4c36cd2-05ae-43ec-a77c-5063e72b4114")
245245
public static final Object instantiate(final ModelElement e) {
246246
for (Stereotype s : e.getExtension()) {
247247
ModuleComponent module = s.getModule();
@@ -261,23 +261,23 @@ public static final Object instantiate(final ModelElement e) {
261261
* @param stName A stereotype name.
262262
* @return the right proxy or <i>null</i>.
263263
*/
264-
@objid ("ee9d5400-d0b2-4467-9a64-37815a400fd1")
264+
@objid ("0933ec1a-699c-40f1-87a0-856d3e782388")
265265
public static final Object instantiate(final Element e, final String stName) {
266266
instantiateVisitor.setStereotype(stName);
267267
return e.accept(instantiateVisitor);
268268
}
269269

270-
@objid ("e75395a1-8306-4729-871a-4faf782d06bb")
270+
@objid ("b26f8c65-95cb-4ce3-8354-e670c0281bd6")
271271
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
272-
@objid ("533dabfd-0329-42c5-bf1b-335e5772ca7d")
272+
@objid ("3784303c-2708-4ac6-9286-2359b3655c6a")
273273
private String stName;
274274

275-
@objid ("98ce983e-042f-465c-bdcf-73a81c16ea7a")
275+
@objid ("927fe00e-cfe0-49cc-b43a-ded84947fc5d")
276276
public final void setStereotype(final String stName) {
277277
this.stName = stName;
278278
}
279279

280-
@objid ("52cb7b05-a590-434d-bd2f-fff919c4cab9")
280+
@objid ("70c55e92-b6bc-4e31-a18e-e7af4293ed00")
281281
@Override
282282
public final Object visitAssociation(Association obj) {
283283
switch (this.stName) {
@@ -290,7 +290,7 @@ public final Object visitAssociation(Association obj) {
290290

291291
}
292292

293-
@objid ("8620a020-5a52-4905-b100-e111f5cd34a7")
293+
@objid ("9ff3e6a8-400b-4bc0-b1cd-74d5340dcca9")
294294
@Override
295295
public final Object visitAttribute(Attribute obj) {
296296
switch (this.stName) {
@@ -305,7 +305,7 @@ public final Object visitAttribute(Attribute obj) {
305305

306306
}
307307

308-
@objid ("9734ee51-44c7-4e26-be4c-8ad22787c844")
308+
@objid ("d66912ad-40af-4e8b-89a3-17355e5a3b76")
309309
@Override
310310
public final Object visitPackage(Package obj) {
311311
switch (this.stName) {
@@ -321,7 +321,7 @@ public final Object visitPackage(Package obj) {
321321

322322
}
323323

324-
@objid ("d6464859-2d24-49d5-b375-55bd877d0075")
324+
@objid ("ee3d98a2-1046-4fc9-a186-2aaf38bd7adf")
325325
@Override
326326
public final Object visitAssociationEnd(AssociationEnd obj) {
327327
switch (this.stName) {
@@ -334,7 +334,7 @@ public final Object visitAssociationEnd(AssociationEnd obj) {
334334

335335
}
336336

337-
@objid ("2f7b0495-9a9d-4f06-837c-e61d30fc8361")
337+
@objid ("b31e0725-5387-4191-8ee9-fc751b3f3175")
338338
@Override
339339
public final Object visitDataType(DataType obj) {
340340
switch (this.stName) {
@@ -348,7 +348,7 @@ public final Object visitDataType(DataType obj) {
348348

349349
}
350350

351-
@objid ("960dd0bb-15fc-4519-9854-d3466a1321e7")
351+
@objid ("2e21846f-5998-444b-b076-e2aa93dd59d6")
352352
@Override
353353
public final Object visitClass(Class obj) {
354354
switch (this.stName) {
@@ -388,7 +388,7 @@ public final Object visitClass(Class obj) {
388388

389389
}
390390

391-
@objid ("ce00fa09-4de4-4b3d-a047-aa2a57df7cfb")
391+
@objid ("ab2da6b0-e9ea-47a9-a75c-84f8c2086c62")
392392
@Override
393393
public final Object visitStaticDiagram(StaticDiagram obj) {
394394
switch (this.stName) {
@@ -403,7 +403,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
403403

404404
}
405405

406-
@objid ("10051a74-9a4b-4793-b076-9e02818437ff")
406+
@objid ("993fe579-85cb-452d-9446-1a7ee4f7ebb9")
407407
@Override
408408
public final Object visitModelElement(ModelElement obj) {
409409
switch (this.stName) {
@@ -471,7 +471,7 @@ public final Object visitModelElement(ModelElement obj) {
471471
* <p>If null is returned the caller will return null.
472472
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
473473
*/
474-
@objid ("64ee7e06-58ba-4151-b850-c687b06de113")
474+
@objid ("d69361bc-b0d8-4620-80b3-061fecd078ff")
475475
@Override
476476
public IInfrastructureVisitor getInfrastructureVisitor() {
477477
return this;

0 commit comments

Comments
 (0)