Skip to content

Commit 637ca71

Browse files
michelu89michelu89
authored
Upgrade to latest java sdk version 2.3.2 and upgrade to latest SAMM 2.1.0 (#92)
* Upgrade to latest java sdk version 2.3.2 and upgrade to latest SAMM 2.1.0 Fixed following bugs: * Support SAMM 2.1.0 #89 * Fix copy to clipboard #87 * Change workspace "Copy to clipboard" to "Copy to path" * Model with invalid constructs are written
1 parent 1bb36df commit 637ca71

File tree

148 files changed

+1341
-825
lines changed

Some content is hidden

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

148 files changed

+1341
-825
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Are you having trouble with Aspect Model Editor? We want to help!
2222

2323
* Check the [developer documentation](https://eclipse-esmf.github.io)
2424
* Check the
25-
SAMM [specification](https://eclipse-esmf.github.io/samm-specification/2.0.0/index.html)
25+
SAMM [specification](https://eclipse-esmf.github.io/samm-specification/2.1.0/index.html)
2626
* Having issues with the Aspect Model Editor? Open
2727
a [GitHub issue](https://github.com/eclipse-esmf/esmf-aspect-model-editor/issues).
2828

‎core/apps/ame-e2e/src/fixtures/abstract-entity.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#>.
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#>.
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.0.0#>.
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.0.0#>.
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#>.
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#>.
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#>.
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#>.
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.

‎core/apps/ame-e2e/src/fixtures/abstract-property.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.0.0#> .
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.0.0#> .
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

‎core/apps/ame-e2e/src/fixtures/all-characteristic.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.0.0#> .
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.0.0#> .
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

‎core/apps/ame-e2e/src/fixtures/anonymous-elements.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.0.0#> .
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.0.0#> .
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

‎core/apps/ame-e2e/src/fixtures/default-models/aspect-default.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.0.0#> .
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.0.0#> .
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
19-
@prefix : <urn:samm:org.eclipse.digitaltwin:1.0.0#> .
19+
@prefix : <urn:samm:org.eclipse.examples.aspect:1.0.0#> .
2020

2121
:AspectDefault a samm:Aspect ;
2222
samm:properties (:property1) ;

‎core/apps/ame-e2e/src/fixtures/default-models/movement.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.0.0#> .
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.0.0#> .
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

‎core/apps/ame-e2e/src/fixtures/entity-values-enumeration.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.0.0#> .
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.0.0#> .
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

‎core/apps/ame-e2e/src/fixtures/enumeration-instances.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#>.
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#>.
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.0.0#>.
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.0.0#>.
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#>.
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#>.
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#>.
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#>.
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.

‎core/apps/ame-e2e/src/fixtures/external-reference/cross-references/different-namespace/external-characteristic-reference.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.0.0#> .
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.0.0#> .
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

0 commit comments

Comments
 (0)