Merge branch 'develop'
diff --git a/features/org.eclipse.app4mc.amalthea.converters.headless.runtime/feature.xml b/features/org.eclipse.app4mc.amalthea.converters.headless.runtime/feature.xml
index 29b4942..e533472 100644
--- a/features/org.eclipse.app4mc.amalthea.converters.headless.runtime/feature.xml
+++ b/features/org.eclipse.app4mc.amalthea.converters.headless.runtime/feature.xml
@@ -2,21 +2,19 @@
<feature
id="org.eclipse.app4mc.amalthea.converters.headless.runtime"
label="APP4MC AMALTHEA Headless Converters Runtime"
- version="0.9.7.qualifier"
- provider-name="Eclipse APP4MC">
+ version="0.9.8.qualifier"
+ provider-name="Eclipse APP4MC"
+ license-feature="org.eclipse.license"
+ license-feature-version="2.0.2.qualifier">
<description url="https://projects.eclipse.org/projects/technology.app4mc">
APP4MC AMALTHEA Model converter headless runtime
</description>
<copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ (c) Copyright 2020 Eclipse APP4MC contributors and others.
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
<plugin
id="org.apache.felix.gogo.command"
download-size="0"
diff --git a/features/org.eclipse.app4mc.amalthea.converters.headless/feature.xml b/features/org.eclipse.app4mc.amalthea.converters.headless/feature.xml
index 5da4185..53dcd51 100644
--- a/features/org.eclipse.app4mc.amalthea.converters.headless/feature.xml
+++ b/features/org.eclipse.app4mc.amalthea.converters.headless/feature.xml
@@ -2,21 +2,19 @@
<feature
id="org.eclipse.app4mc.amalthea.converters.headless"
label="APP4MC AMALTHEA Headless Converters"
- version="0.9.7.qualifier"
- provider-name="Eclipse APP4MC">
+ version="0.9.8.qualifier"
+ provider-name="Eclipse APP4MC"
+ license-feature="org.eclipse.license"
+ license-feature-version="2.0.2.qualifier">
<description url="https://projects.eclipse.org/projects/technology.app4mc">
APP4MC AMALTHEA Model converters without UI
</description>
<copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ (c) Copyright 2018-2020 Eclipse APP4MC contributors and others.
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
<plugin
id="org.eclipse.app4mc.amalthea.converters.071"
download-size="0"
diff --git a/features/org.eclipse.app4mc.amalthea.converters.sdk/feature.xml b/features/org.eclipse.app4mc.amalthea.converters.sdk/feature.xml
index 5d3c1d9..75bd666 100644
--- a/features/org.eclipse.app4mc.amalthea.converters.sdk/feature.xml
+++ b/features/org.eclipse.app4mc.amalthea.converters.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.app4mc.amalthea.converters.sdk"
label="APP4MC AMALTHEA Converters SDK"
- version="0.9.7.qualifier"
+ version="0.9.8.qualifier"
provider-name="Eclipse APP4MC"
license-feature="org.eclipse.license"
license-feature-version="2.0.2.qualifier">
@@ -12,8 +12,7 @@
</description>
<copyright url="https://projects.eclipse.org/projects/technology.app4mc">
- (c) Copyright Eclipse APP4MC contributors and others. 2018.
-All rights reserved.
+ (c) Copyright 2018-2020 Eclipse APP4MC contributors and others.
</copyright>
<includes
diff --git a/features/org.eclipse.app4mc.amalthea.converters/feature.xml b/features/org.eclipse.app4mc.amalthea.converters/feature.xml
index 5e0ce0f..07793e9 100644
--- a/features/org.eclipse.app4mc.amalthea.converters/feature.xml
+++ b/features/org.eclipse.app4mc.amalthea.converters/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.app4mc.amalthea.converters"
label="APP4MC AMALTHEA Converters"
- version="0.9.7.qualifier"
+ version="0.9.8.qualifier"
provider-name="Eclipse APP4MC"
license-feature="org.eclipse.license"
license-feature-version="2.0.2.qualifier">
@@ -12,8 +12,7 @@
</description>
<copyright url="https://projects.eclipse.org/projects/technology.app4mc">
- (c) Copyright Eclipse APP4MC contributors and others. 2018.
-All rights reserved.
+ (c) Copyright 2018-2020 Eclipse APP4MC contributors and others.
</copyright>
<includes
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.071/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.071/META-INF/MANIFEST.MF
index a1f4ac5..e111105 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.071/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.071/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.7.1
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.071;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Import-Package: org.eclipse.app4mc.amalthea.converters.common;version="0.9.7",
@@ -14,9 +14,9 @@
org.slf4j;version="1.7.2"
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.071
Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.SwConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters071.utils.SectionRunnableLabelCacheBuilder.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.ConstraintsConverter.xml,
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.ConstraintsConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.SwConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.RootElementConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.HwConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters071.utils.SectionRunnableLabelCacheBuilder.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.PropertyConstraintsConverter.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.072/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.072/META-INF/MANIFEST.MF
index 9f05a17..6433e0c 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.072/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.072/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.7.2
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.072;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.072
@@ -13,13 +13,13 @@
org.jdom2;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters072.utils.HwElementsCacheBuilder.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.CommonElementsConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.ConfigConverter.xml,
+Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.ConfigConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.SwConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.PropertyConstraintsConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters072.utils.HwElementsCacheBuilder.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.OSConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.RootElementConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.CommonElementsConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.StimuliConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.ConstraintsConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.080/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.080/META-INF/MANIFEST.MF
index a74df01..c8a2291 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.080/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.080/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.8.0
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.080;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.080
@@ -14,10 +14,10 @@
org.jdom2.output;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.MappingConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.PropertyConstraintsConverter.xml,
+Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.PropertyConstraintsConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.MappingConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.StimuliConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.SwConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.OSConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.RootElementConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.081/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.081/META-INF/MANIFEST.MF
index 323216e..a330683 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.081/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.081/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.8.1
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.081;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.081
@@ -13,6 +13,7 @@
org.jdom2;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
+Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters081.impl.RootElementConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters081.impl.ConstraintsConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters081.utils.ConstraintElementsCacheBuilder.xml,
@@ -21,4 +22,3 @@
OSGI-INF/org.eclipse.app4mc.amalthea.converters081.impl.MappingConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters081.impl.OSConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters081.impl.SwConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.082/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.082/META-INF/MANIFEST.MF
index e61858c..18a4d55 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.082/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.082/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.8.2
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.082;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.082
@@ -13,5 +13,5 @@
org.jdom2;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters082.impl.RootElementConverter.xml
Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters082.impl.RootElementConverter.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.083/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.083/META-INF/MANIFEST.MF
index 3c08a21..155c99d 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.083/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.083/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.8.3
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.083;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.083
@@ -13,9 +13,9 @@
org.jdom2;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
+Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters083.impl.ComponentModelConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters083.impl.SwConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters083.impl.RootElementConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters083.impl.StimuliConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters083.utils.PeriodicStimulusCacheBuilder.xml
-Bundle-ActivationPolicy: lazy
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters083.utils.PeriodicStimulusCacheBuilder.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters083.impl.StimuliConverter.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.090/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.090/META-INF/MANIFEST.MF
index 1aa25e7..aa6fd70 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.090/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.090/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.0
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.090;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.090
@@ -13,9 +13,9 @@
org.jdom2;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters090.utils.UpdateCustomPropsPostProcessor.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters090.impl.HwReferencesConverter.xml,
+Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters090.impl.HwReferencesConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters090.impl.RootElementConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters090.impl.HwConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters090.utils.HWCacheBuilder.xml
-Bundle-ActivationPolicy: lazy
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters090.utils.HWCacheBuilder.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters090.utils.UpdateCustomPropsPostProcessor.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.091/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.091/META-INF/MANIFEST.MF
index 07ad43f..c659c09 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.091/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.091/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.1
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.091;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.091
@@ -13,6 +13,6 @@
org.jdom2;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
+Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters091.impl.RootElementConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters091.impl.CustomPropertiesConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.092/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.092/META-INF/MANIFEST.MF
index 003beae..84b2d32 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.092/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.092/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.2
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.092;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.092
@@ -13,5 +13,5 @@
org.jdom2;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters092.impl.RootElementConverter.xml
Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters092.impl.RootElementConverter.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.093/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.093/META-INF/MANIFEST.MF
index d7e90f2..a37ca48 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.093/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.093/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.3
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.093;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.093
@@ -13,11 +13,11 @@
org.jdom2;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters093.utils.HWCacheBuilder.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.HwConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.RootElementConverter.xml,
+Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.RootElementConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.SwConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.HwConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.OsConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters093.utils.HWCacheBuilder.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.StimulusConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.MeasurementConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.094/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.094/META-INF/MANIFEST.MF
index 8c1bc7d..4e4b6c1 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.094/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.094/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.4
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.094;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.094
@@ -13,6 +13,6 @@
org.jdom2;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
+Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters094.impl.HwConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters094.impl.SwConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.095/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.095/META-INF/MANIFEST.MF
index b689d65..bad00b5 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.095/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.095/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.5
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.095;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.095
@@ -13,6 +13,6 @@
org.jdom2;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
+Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters095.impl.SwConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters095.impl.StimuliConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.096/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.096/META-INF/MANIFEST.MF
index 6da698c..22647d6 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.096/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.096/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.6
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.096;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.096
@@ -13,6 +13,6 @@
org.jdom2;version="2.0.6",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j
+Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters096.impl.SwConverter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters096.impl.ConstraintsConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.097/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.097/META-INF/MANIFEST.MF
index dc31dcd..7f3c677 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.097/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.097/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.7
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.097
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.097
@@ -15,5 +15,5 @@
org.slf4j
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters097.utils.ComponentPortInterfaceCacheBuilder.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters097.impl.ComponentsModelConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters097.utils.AmltModelReferencePostProcessor.xml
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters097.utils.AmltModelReferencePostProcessor.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters097.impl.ComponentsModelConverter.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.common/META-INF/MANIFEST.MF
index 26d9350..8fd1fcc 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters Common
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.common;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.app4mc.amalthea.converters.common;version="0.9.7",
@@ -22,7 +22,7 @@
org.osgi.service.component;version="1.3.0",
org.osgi.service.component.annotations;version="1.3.0";resolution:=optional,
org.slf4j;version="1.7.2"
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.ModelMigration.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.MigrationProcessor.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter.xml
Require-Bundle: org.eclipse.equinox.common;bundle-version="3.10.0"
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.ModelMigration.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.MigrationProcessor.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationHelper.java b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationHelper.java
index f719a49..9e7bc48 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationHelper.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationHelper.java
@@ -15,6 +15,7 @@
package org.eclipse.app4mc.amalthea.converters.common;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
@@ -25,12 +26,15 @@
import java.util.Map;
import java.util.Set;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.StartElement;
+import javax.xml.stream.events.XMLEvent;
+
import org.eclipse.app4mc.amalthea.converters.common.utils.AmaltheaNamespaceRegistry;
import org.eclipse.app4mc.amalthea.converters.common.utils.HelperUtil;
import org.eclipse.app4mc.amalthea.converters.common.utils.ModelVersion;
-import org.eclipse.core.runtime.SubMonitor;
-import org.jdom2.Document;
-import org.jdom2.Element;
import org.jdom2.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,42 +51,20 @@
public static Map<File, MigrationInputFile> populateModels(
List<File> inputModelFiles,
- MigrationSettings migrationSettings,
- SubMonitor subMonitor) throws Exception {
+ MigrationSettings migrationSettings) throws Exception {
HashMap<File, MigrationInputFile> modelFilesMap = new HashMap<>();
- HashMap<File, Document> loadedDocumentsMapping = new HashMap<>();
-
- for (File file : inputModelFiles) {
- Document xmlDoc = HelperUtil.loadFile(file.getAbsolutePath());
- loadedDocumentsMapping.put(file.getCanonicalFile(), xmlDoc);
-
- if (subMonitor != null) {
- subMonitor.worked(1);
- }
- }
-
- for (final File inputFile : loadedDocumentsMapping.keySet()) {
- Document xmlDocument = loadedDocumentsMapping.get(inputFile);
+ for (File inputFile : inputModelFiles) {
MigrationInputFile migModelFile = new MigrationInputFile();
- migModelFile.setFile(inputFile, migrationSettings.getProject());
+ migModelFile.setFile(inputFile.getCanonicalFile(), migrationSettings.getProject());
// identify if the model file that is selected by the user
migModelFile.setSelectedFile(inputModelFiles.contains(inputFile));
- migModelFile.setDocument(xmlDocument);
// set the model file version
- Element rootElement = xmlDocument.getRootElement();
- Namespace namespace = rootElement.getNamespace();
-
- ModelVersion version = AmaltheaNamespaceRegistry.getModelVersion(namespace);
- if (version != null) {
- migModelFile.setModelVersion(version.getVersion());
- } else {
- migModelFile.setModelVersion("invalid");
- }
+ migModelFile.setModelVersion(getModelVersion(inputFile));
modelFilesMap.put(inputFile, migModelFile);
}
@@ -412,4 +394,46 @@
return newFileName;
}
+ /**
+ * Extract the model version of the given input model file.
+ *
+ * @param inputModelFile The model file for which the model version is
+ * requested.
+ * @return The model version of the given input model file or <i>invalid</i> if
+ * an error occurs on parsing or the model version is invalid.
+ */
+ public static String getModelVersion(File inputModelFile) {
+ String result = "";
+
+ if (inputModelFile != null && inputModelFile.exists() && inputModelFile.getName().endsWith(".amxmi")) {
+ try (FileInputStream input = new FileInputStream(inputModelFile)) {
+ XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
+ XMLEventReader reader = xmlInputFactory.createXMLEventReader(input);
+ while (reader.hasNext()) {
+ XMLEvent nextEvent = reader.nextEvent();
+ if (nextEvent.isStartElement()) {
+ StartElement startElement = nextEvent.asStartElement();
+ if ("am".equals(startElement.getName().getPrefix())) {
+
+ String url = startElement.getNamespaceURI("am");
+ Namespace namespace = Namespace.getNamespace("am", url);
+ ModelVersion version = AmaltheaNamespaceRegistry.getModelVersion(namespace);
+ if (version != null) {
+ result = version.getVersion();
+ } else {
+ result = "invalid";
+ }
+ // we found the root tag and parsed the model version, now we can stop parsing
+ break;
+ }
+ }
+ }
+ } catch (IOException | XMLStreamException e) {
+ LOGGER.error("Error on parsing input model file for model version", e);
+ result = "invalid";
+ }
+ }
+
+ return result;
+ }
}
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationInputFile.java b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationInputFile.java
index 7834cc9..e074fc4 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationInputFile.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationInputFile.java
@@ -1,6 +1,6 @@
/**
********************************************************************************
- * Copyright (c) 2015-2019 Robert Bosch GmbH and others.
+ * Copyright (c) 2015-2020 Robert Bosch GmbH and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -17,10 +17,15 @@
import java.io.File;
+import org.eclipse.app4mc.amalthea.converters.common.utils.HelperUtil;
import org.jdom2.Document;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MigrationInputFile {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MigrationInputFile.class);
+
private String modelVersion = "";
private boolean isSelectedFile;
@@ -64,6 +69,13 @@
}
public Document getDocument() {
+ if (this.document == null) {
+ try {
+ this.document = HelperUtil.loadFile(file.getAbsolutePath());
+ } catch (Exception e) {
+ LOGGER.error("Failed to load model file {}", file.getAbsolutePath(), e);
+ }
+ }
return this.document;
}
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationProcessor.java b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationProcessor.java
index af9d4c3..3d4761b 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationProcessor.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationProcessor.java
@@ -42,7 +42,7 @@
private static final String NEWLINE = System.getProperty("line.separator");
@Reference(target = "(component.factory=" + ServiceConstants.MODEL_MIGRATION_FACTORY + ")")
- ComponentFactory factory;
+ ComponentFactory<ModelMigration> factory;
/**
* Execute the migration for the provided {@link MigrationSettings}.
@@ -115,8 +115,8 @@
properties.put("caches.target", inputFilterExp);
properties.put("converter.target", inputOuputFilterExpression);
properties.put("postProcessor.target", inputOuputFilterExpression);
- ComponentInstance newInstance = factory.newInstance(properties);
- ModelMigration modelMigration = (ModelMigration) newInstance.getInstance();
+ ComponentInstance<ModelMigration> newInstance = factory.newInstance(properties);
+ ModelMigration modelMigration = newInstance.getInstance();
String outputModelVersion = modelMigration.getOutputModelVersion();
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationSettings.java b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationSettings.java
index 93d3984..d72474e 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationSettings.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationSettings.java
@@ -81,10 +81,13 @@
public Map<File, Document> getMigModelFilesMap() {
- final Map<File, Document> migModelsMap = new HashMap<File, Document>();
+ final Map<File, Document> migModelsMap = new HashMap<>();
for (final MigrationInputFile migModelFile : this.migModelFiles) {
- migModelsMap.put(migModelFile.getFile(), migModelFile.getDocument());
+ Document document = migModelFile.getDocument();
+ if (document != null) {
+ migModelsMap.put(migModelFile.getFile(), document);
+ }
}
return migModelsMap;
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/ModelMigration.java b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/ModelMigration.java
index 68cc881..bd18d5d 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/ModelMigration.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/ModelMigration.java
@@ -41,7 +41,7 @@
List<ICache> caches;
@Reference(target = "(component.factory=" + ServiceConstants.NAMESPACE_CONVERTER_FACTORY + ")")
- ComponentFactory factory;
+ ComponentFactory<IConverter> factory;
@Reference
List<IConverter> converter;
@@ -69,8 +69,8 @@
Dictionary<String, Object> properties = new Hashtable<>();
properties.put(ServiceConstants.INPUT_MODEL_VERSION_PROPERTY, getInputModelVersion());
properties.put(ServiceConstants.OUTPUT_MODEL_VERSION_PROPERTY, getOutputModelVersion());
- ComponentInstance newInstance = factory.newInstance(properties);
- IConverter namespaceConverter = (IConverter) newInstance.getInstance();
+ ComponentInstance<IConverter> newInstance = factory.newInstance(properties);
+ IConverter namespaceConverter = newInstance.getInstance();
result.add(namespaceConverter);
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/AmaltheaNamespaceRegistry.java b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/AmaltheaNamespaceRegistry.java
index 4b495f9..582b668 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/AmaltheaNamespaceRegistry.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/AmaltheaNamespaceRegistry.java
@@ -141,6 +141,10 @@
AmaltheaNamespace ns097 = new AmaltheaNamespace();
ns097.registerMapping("am", "http://app4mc.eclipse.org/amalthea/0.9.7");
REGISTRY.put(ModelVersion._097.getVersion(), ns097);
+
+ AmaltheaNamespace ns098 = new AmaltheaNamespace();
+ ns098.registerMapping("am", "http://app4mc.eclipse.org/amalthea/0.9.8");
+ REGISTRY.put(ModelVersion._098.getVersion(), ns098);
}
/**
@@ -205,6 +209,9 @@
else if (isNamespaceAvailable(ModelVersion._097, namespace)) {
result = ModelVersion._097;
}
+ else if (isNamespaceAvailable(ModelVersion._098, namespace)) {
+ result = ModelVersion._098;
+ }
return result;
}
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/ModelVersion.java b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/ModelVersion.java
index 29e7ba8..144baf1 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/ModelVersion.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/ModelVersion.java
@@ -1,6 +1,6 @@
/**
********************************************************************************
- * Copyright (c) 2015-2019 Robert Bosch GmbH and others.
+ * Copyright (c) 2015-2020 Robert Bosch GmbH and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -45,7 +45,8 @@
_094("0.9.4"),
_095("0.9.5"),
_096("0.9.6"),
- _097("0.9.7");
+ _097("0.9.7"),
+ _098("0.9.8");
private final String value;
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/META-INF/MANIFEST.MF
index 7cf5b20..a4643b7 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters Headless App
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.headless.app
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.headless.app
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
@@ -15,6 +15,6 @@
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.equinox.common;bundle-version="3.10.0",
org.apache.felix.gogo.runtime;bundle-version="1.0.6"
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters.headless.app.ModelMigrationCommand.xml,
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters.headless.app.BndMigrationStarter.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.converters.headless.app.EquinoxMigrationStarter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters.headless.app.BndMigrationStarter.xml
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters.headless.app.ModelMigrationCommand.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/AbstractMigrationStarter.java b/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/AbstractMigrationStarter.java
index a20aa29..bfc9f19 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/AbstractMigrationStarter.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/AbstractMigrationStarter.java
@@ -66,6 +66,26 @@
recursive = true;
} else if (arg.startsWith("-nb") || arg.startsWith("--nobackup")) {
noBackup = true;
+ } else if (arg.startsWith("/?") || arg.startsWith("-h") || arg.startsWith("--help")) {
+ // only print the help and exit
+ System.out.println();
+ System.out.println("[-v, --version <model_version>] [-r, --recursive] [-nb, --nobackup] <filename>");
+ System.out.println();
+ System.out.println("Options:");
+ System.out.println("\t-v, --version \tThe model version to which the model should be migrated to [optional].");
+ System.out.println("\t\t\tIf not provided the latest supported version will be used.");
+ System.out.println();
+ System.out.println("\t-r, --recursive\tIf folders should be traversed recursively [optional].");
+ System.out.println("\t\t\tIf not provided only the files in the given folder will be migrated.");
+ System.out.println();
+ System.out.println("\t-nb, --nobackup\tIf backup files should be created before the migration process [optional].");
+ System.out.println("\t\t\tIf not provided a backup file will be created for every model file.");
+ System.out.println();
+ System.out.println("\t-h, --help, /?\tShow this help.");
+ System.out.println();
+ System.out.println("Parameter:");
+ System.out.println("\tfilename\tThe filename of the model file or the folder that contains model files to migrate");
+ System.exit(0);
} else if (!arg.startsWith("-") && arg.trim().length() > 0){
filenameList.add(arg);
}
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/EquinoxMigrationStarter.java b/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/EquinoxMigrationStarter.java
index 92cce9c..31db364 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/EquinoxMigrationStarter.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/EquinoxMigrationStarter.java
@@ -56,13 +56,16 @@
// only process model migration activation if the EnvironmentInfo is initialized
// properly
if (this.environmentInfo.getNonFrameworkArgs() != null) {
- // check if a product was started
+ // check if a product or an application was started
// if yes this starter should do nothing
boolean isProduct =
Arrays.stream(environmentInfo.getNonFrameworkArgs()).anyMatch(arg -> "-product".equals(arg))
|| this.environmentInfo.getProperty("eclipse.product") != null;
+ boolean isApplication =
+ Arrays.stream(environmentInfo.getNonFrameworkArgs()).anyMatch(arg -> "-application".equals(arg))
+ || this.environmentInfo.getProperty("eclipse.application") != null;
- if (!isProduct) {
+ if (!isProduct && !isApplication) {
// check if -console or -consoleLog was provided as launch argument
boolean isInteractive = Arrays.stream(environmentInfo.getFrameworkArgs())
.anyMatch(arg -> "-console".equals(arg));
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/ModelMigrationCommand.java b/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/ModelMigrationCommand.java
index 4071cf2..d923fee 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/ModelMigrationCommand.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/src/org/eclipse/app4mc/amalthea/converters/headless/app/ModelMigrationCommand.java
@@ -36,8 +36,6 @@
import org.eclipse.app4mc.amalthea.converters.common.utils.ModelVersion;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Command to execute a AMALTHEA model migration. Is registered as Felix Gogo Shell command.
@@ -50,8 +48,6 @@
service = ModelMigrationCommand.class)
public class ModelMigrationCommand {
- private static final Logger LOGGER = LoggerFactory.getLogger(ModelMigrationCommand.class);
-
@Reference
MigrationProcessor migrationProcessor;
@@ -123,7 +119,8 @@
convert(modelFiles, migrationSettings, noBackup);
}
} catch (IOException e) {
- LOGGER.error("Failed to load model files", e);
+ System.err.println("Failed to load model files");
+ e.printStackTrace();
return;
}
@@ -145,7 +142,8 @@
convertDirectory(path, outputModelVersion, recursive, noBackup);
}
} catch (IOException e) {
- LOGGER.error("Failed to load model files", e);
+ System.err.println("Failed to load model files");
+ e.printStackTrace();
return;
}
}
@@ -156,10 +154,11 @@
// same as ModelLoaderJob
try {
Map<File, MigrationInputFile> modelFilesMap =
- MigrationHelper.populateModels(inputFiles, migrationSettings, null);
+ MigrationHelper.populateModels(inputFiles, migrationSettings);
migrationSettings.getMigModelFiles().addAll(modelFilesMap.values());
} catch (Exception e) {
- LOGGER.error("Failed to load model files", e);
+ System.err.println("Failed to load model files");
+ e.printStackTrace();
return;
}
@@ -179,6 +178,21 @@
+ ")\nIt is not required to migrate the models in " + migrationSettings.getOutputDirectoryLocation());
return;
} else {
+ // check if a migration needs to be executed
+ Map<String, String> migStepEntries = MigrationHelper.generateMigrationSteps(
+ migrationSettings.getInputModelVersion(),
+ migrationSettings.getMigrationModelVersion());
+
+ if (migStepEntries.size() == 0) {
+ System.err.println("Migration not supported for the selected model versions. \n"
+ + "Input Model version : \""
+ + migrationSettings.getInputModelVersion()
+ + "\" Output Model Version : \""
+ + migrationSettings.getMigrationModelVersion()
+ + "\"");
+ return;
+ }
+
// set the file parent folder as output location to convert the file at source
MigrationInputFile migrationInputFile = migrationSettings.getMigModelFiles().get(0);
migrationSettings.setOutputDirectoryLocation(migrationInputFile.getFile().getParent());
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.help/META-INF/MANIFEST.MF
index c1bb2ae..d7a610a 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.help/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.help/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters Help
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.help;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-Vendor: Eclipse APP4MC
Require-Bundle: org.eclipse.help
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.help/docu/meta_model_changes.textile b/plugins/org.eclipse.app4mc.amalthea.converters.help/docu/meta_model_changes.textile
index aa83645..c6b7611 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.help/docu/meta_model_changes.textile
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.help/docu/meta_model_changes.textile
@@ -625,3 +625,12 @@
|tasks|processes|AbstractProcess|AbstractProcess|Component|ComponentsModel|tasks reference is renamed to processes|
|callGraph|activityGraph|CallGraph|ActivityGraph|Process|sw|callGraph reference is renamed to activityGraph|
|callGraph|activityGraph|CallGraph|ActivityGraph|Runnable|sw|callGraph reference is renamed to activityGraph|
+
+h3. Version APP4MC 0.9.7 to APP4MC 0.9.8
+
+*Change in the namespace:*
+
+table(classic){margin-left:40px}.
+| *_AMALTHEA Namespace (version App4MC 0.9.7)_* | *_AMALTHEA Namespace (version App4MC 0.9.8)_* |
+|http://app4mc.eclipse.org/amalthea/0.9.7|http://app4mc.eclipse.org/amalthea/0.9.8 |
+
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.help/pom.xml b/plugins/org.eclipse.app4mc.amalthea.converters.help/pom.xml
index 43b85e0..65dd310 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.help/pom.xml
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.help/pom.xml
@@ -1,64 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <artifactId>
- org.eclipse.app4mc.amalthea.converters.help
- </artifactId>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>org.eclipse.app4mc.converters</groupId>
+ <relativePath>../../pom.xml</relativePath>
+ <version>0.9.8-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>org.eclipse.app4mc.amalthea.converters.help</artifactId>
+
+ <packaging>eclipse-plugin</packaging>
+
<build>
<plugins>
- <plugin>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
<executions>
- <execution>
+ <execution>
<configuration>
<target>
<ant antfile="build-help.ant"/>
</target>
</configuration>
<goals>
- <goal>
- run
- </goal>
+ <goal>run</goal>
</goals>
- <id>
- replace-build-token
- </id>
- <phase>
- generate-sources
- </phase>
+ <id>replace-build-token</id>
+ <phase>generate-sources</phase>
</execution>
</executions>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <version>
- 1.7
- </version>
</plugin>
-
</plugins>
</build>
- <modelVersion>
- 4.0.0
- </modelVersion>
- <packaging>
- eclipse-plugin
- </packaging>
- <parent>
- <artifactId>
- parent
- </artifactId>
- <groupId>
- org.eclipse.app4mc.converters
- </groupId>
- <relativePath>
- ../../pom.xml
- </relativePath>
- <version>
- 0.9.7-SNAPSHOT
- </version>
- </parent>
</project>
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.log4j.configuration/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.log4j.configuration/META-INF/MANIFEST.MF
index c37d0f4..6d221a6 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.log4j.configuration/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.log4j.configuration/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Log4j Configuration
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.log4j.configuration
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.log4j.configuration
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.ui/META-INF/MANIFEST.MF
index 95c6981..aef6dee 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters UI
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.ui;singleton:=true
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-Vendor: Eclipse APP4MC
Export-Package: org.eclipse.app4mc.amalthea.converters.ui.jobs
Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.ui/src/org/eclipse/app4mc/amalthea/converters/ui/dialog/ModelMigrationDialog.java b/plugins/org.eclipse.app4mc.amalthea.converters.ui/src/org/eclipse/app4mc/amalthea/converters/ui/dialog/ModelMigrationDialog.java
index d1fed35..ac841f0 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.ui/src/org/eclipse/app4mc/amalthea/converters/ui/dialog/ModelMigrationDialog.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.ui/src/org/eclipse/app4mc/amalthea/converters/ui/dialog/ModelMigrationDialog.java
@@ -1,6 +1,6 @@
/**
********************************************************************************
- * Copyright (c) 2015-2019 Robert Bosch GmbH and others.
+ * Copyright (c) 2015-2020 Robert Bosch GmbH and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -29,12 +29,12 @@
import org.eclipse.app4mc.amalthea.converters.ui.providers.MigrationInputDataProvider;
import org.eclipse.app4mc.amalthea.converters.ui.providers.StyledLabelProvider;
import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.PojoProperties;
+import org.eclipse.core.databinding.beans.typed.PojoProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.layout.GridDataFactory;
@@ -316,18 +316,16 @@
protected DataBindingContext initDataBindings(Text txtOutputDirectory, Combo migModelVersionCombo) {
DataBindingContext bindingContext = new DataBindingContext();
- ISWTObservableValue observeTextTxtOutputDirectoryObserveWidget =
+ ISWTObservableValue<String> observeTextTxtOutputDirectoryObserveWidget =
WidgetProperties.text(SWT.Modify).observe(txtOutputDirectory);
- ISWTObservableValue observeSelectionMig_model_version_comboObserveWidget =
- WidgetProperties.selection().observe(migModelVersionCombo);
+ ISWTObservableValue<?> observeSelectionMig_model_version_comboObserveWidget =
+ WidgetProperties.comboSelection().observe(migModelVersionCombo);
- @SuppressWarnings("unchecked")
IObservableValue<?> outputDirectoryLocationMigDataModelObserveValue =
PojoProperties.value("outputDirectoryLocation").observe(this.migrationSettings);
bindingContext.bindValue(observeTextTxtOutputDirectoryObserveWidget,
outputDirectoryLocationMigDataModelObserveValue, null, null);
- @SuppressWarnings("unchecked")
IObservableValue<?> migrationModelVersionMigrationSettingsObserveValue =
PojoProperties.value("migrationModelVersion").observe(this.migrationSettings);
bindingContext.bindValue(observeSelectionMig_model_version_comboObserveWidget,
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.ui/src/org/eclipse/app4mc/amalthea/converters/ui/jobs/ModelLoaderJob.java b/plugins/org.eclipse.app4mc.amalthea.converters.ui/src/org/eclipse/app4mc/amalthea/converters/ui/jobs/ModelLoaderJob.java
index 1a20c5e..76a1112 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.ui/src/org/eclipse/app4mc/amalthea/converters/ui/jobs/ModelLoaderJob.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.ui/src/org/eclipse/app4mc/amalthea/converters/ui/jobs/ModelLoaderJob.java
@@ -1,6 +1,6 @@
/**
********************************************************************************
- * Copyright (c) 2015-2019 Robert Bosch GmbH and others.
+ * Copyright (c) 2015-2020 Robert Bosch GmbH and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -53,7 +53,7 @@
try {
Map<File, MigrationInputFile> modelFilesMap =
- MigrationHelper.populateModels(this.inputModels, this.migrationSettings, subMonitor);
+ MigrationHelper.populateModels(this.inputModels, this.migrationSettings);
this.migrationSettings.getMigModelFiles().addAll(modelFilesMap.values());
}
catch (final Exception e1) {
diff --git a/pom.xml b/pom.xml
index ed8aabd..8c73099 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.eclipse.app4mc.converters</groupId>
<artifactId>parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.8-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -14,8 +14,8 @@
<name>APP4MC Migration Component</name>
<properties>
- <app4mc.version>0.9.7-SNAPSHOT</app4mc.version>
- <app4mc.baseline>0.9.6</app4mc.baseline>
+ <app4mc.version>0.9.8-SNAPSHOT</app4mc.version>
+ <app4mc.baseline>0.9.7</app4mc.baseline>
<tycho.version>1.6.0</tycho.version>
diff --git a/releng/org.eclipse.app4mc.converters.p2repo/category.xml b/releng/org.eclipse.app4mc.converters.p2repo/category.xml
index ad5bb82..0b08e2c 100644
--- a/releng/org.eclipse.app4mc.converters.p2repo/category.xml
+++ b/releng/org.eclipse.app4mc.converters.p2repo/category.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.app4mc.amalthea.converters_0.9.7.qualifier.jar" id="org.eclipse.app4mc.amalthea.converters" version="0.9.7.qualifier">
+ <feature id="org.eclipse.app4mc.amalthea.converters">
<category name="org.eclipse.app4mc.amalthea.converters"/>
</feature>
- <feature url="features/org.eclipse.app4mc.amalthea.converters.sdk_0.9.7.qualifier.jar" id="org.eclipse.app4mc.amalthea.converters.sdk" version="0.9.7.qualifier">
+ <feature id="org.eclipse.app4mc.amalthea.converters.sdk">
<category name="org.eclipse.app4mc.amalthea.converters"/>
</feature>
<category-def name="org.eclipse.app4mc.amalthea.converters" label="APP4MC Converters"/>
diff --git a/releng/org.eclipse.app4mc.converters.p2repo/pom.xml b/releng/org.eclipse.app4mc.converters.p2repo/pom.xml
index cd0eebe..24ffcb9 100644
--- a/releng/org.eclipse.app4mc.converters.p2repo/pom.xml
+++ b/releng/org.eclipse.app4mc.converters.p2repo/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.app4mc.converters</groupId>
<artifactId>parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.8-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -165,7 +165,8 @@
<!-- Symbols are used while expanding index.html template -->
<symbols>
<update.site.name>${project.parent.name}</update.site.name>
- <target.eclipse.version>Photon (4.8.0)</target.eclipse.version>
+ <target.eclipse.version>IDE 2019-12 (4.14)</target.eclipse.version>
+ <target.app4mc.version>APP4MC 0.9.8</target.app4mc.version>
</symbols>
<associateSites>
diff --git a/releng/org.eclipse.app4mc.converters.p2repo/siteTemplate/index.html b/releng/org.eclipse.app4mc.converters.p2repo/siteTemplate/index.html
index ae0f77d..f30968b 100644
--- a/releng/org.eclipse.app4mc.converters.p2repo/siteTemplate/index.html
+++ b/releng/org.eclipse.app4mc.converters.p2repo/siteTemplate/index.html
@@ -5,11 +5,11 @@
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
- <h2 class="title">${update.site.name} - Use this URL in Eclipse to install ${update.site.name}</h2>
+ <h2 class="title">${update.site.name} - Use this URL in Eclipse APP4MC to install the component</h2>
- <p>This is the Update Site for ${update.site.name}.
+ <p>This is the Update Site for the ${update.site.name}.
<ol>
- <li>To install ${update.site.name} from this site, start up Eclipse ${target.eclipse.version}, then do:
+ <li>To install the ${update.site.name} from this site, start up Eclipse ${target.app4mc.version}, then do:
<ul><code><strong>Help > Install New Software... ></strong></code></ul>
</li>
<li>Copy this site's URL into Eclipse, and hit Enter.</li>
diff --git a/releng/org.eclipse.app4mc.converters.product/headless.product b/releng/org.eclipse.app4mc.converters.product/headless.product
index c602386..f12a0bc 100644
--- a/releng/org.eclipse.app4mc.converters.product/headless.product
+++ b/releng/org.eclipse.app4mc.converters.product/headless.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product uid="org.eclipse.app4mc.converters.headless" version="0.9.7.qualifier" useFeatures="true" includeLaunchers="true">
+<product uid="org.eclipse.app4mc.converters.headless" version="0.9.8.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -313,8 +313,8 @@
<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
- <property name="eclipse.ignoreApp" value="true" />
<property name="log4j.configuration" value="headless_log4j.xml" />
+ <property name="eclipse.ignoreApp" value="true" />
<property name="osgi.noShutdown" value="true" />
</configurations>
diff --git a/releng/org.eclipse.app4mc.converters.product/pom.xml b/releng/org.eclipse.app4mc.converters.product/pom.xml
index b4fc24a..0755baf 100644
--- a/releng/org.eclipse.app4mc.converters.product/pom.xml
+++ b/releng/org.eclipse.app4mc.converters.product/pom.xml
@@ -7,14 +7,14 @@
<parent>
<groupId>org.eclipse.app4mc.converters</groupId>
<artifactId>parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.8-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.app4mc.converters</groupId>
<artifactId>headless</artifactId>
+
<packaging>eclipse-repository</packaging>
- <version>0.9.7-SNAPSHOT</version>
<build>
<plugins>
diff --git a/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.target b/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.target
index ba8910a..dbd6984 100644
--- a/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.target
+++ b/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.target
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Amalthea Model Migration Target" sequenceNumber="1576582171">
+<target name="Amalthea Model Migration Target" sequenceNumber="1582013112">
<locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.ide" version="4.8.0.I20180611-0500"/>
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.14.0.v20180518-2029"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/>
+ <unit id="org.eclipse.sdk.ide" version="4.14.0.I20191210-0610"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.20.0.v20191122-2104"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
@@ -16,10 +16,10 @@
<unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/>
<unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
<unit id="org.apache.felix.gogo.command" version="1.0.2.v20170914-1324"/>
- <unit id="org.apache.felix.gogo.runtime" version="1.0.6.v20170914-1324"/>
- <unit id="org.apache.felix.gogo.shell" version="1.0.0.v20170914-1324"/>
- <unit id="org.eclipse.equinox.console" version="1.3.0.v20180119-0630"/>
- <repository location="http://download.eclipse.org/releases/photon"/>
+ <unit id="org.apache.felix.gogo.runtime" version="1.1.0.v20180713-1646"/>
+ <unit id="org.apache.felix.gogo.shell" version="1.1.0.v20180713-1646"/>
+ <unit id="org.eclipse.equinox.console" version="1.4.0.v20190819-1430"/>
+ <repository location="http://download.eclipse.org/releases/2019-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.jaxen" version="1.1.6.v20191106-1554"/>
diff --git a/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.tpd b/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.tpd
index c3c9af6..99af213 100644
--- a/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.tpd
+++ b/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.tpd
@@ -2,7 +2,7 @@
with source allEnvironments
-location "http://download.eclipse.org/releases/photon" {
+location "http://download.eclipse.org/releases/2019-12" {
org.eclipse.sdk.ide
org.eclipse.equinox.sdk.feature.group
org.eclipse.emf.sdk.feature.group
@@ -14,10 +14,10 @@
org.apache.xerces [2.9.0,2.10.0)
org.apache.xml.resolver [1.2.0,1.2.1)
org.apache.xml.serializer [2.7.1,2.7.2)
- org.apache.felix.gogo.command [1.0.2,1.0.3)
- org.apache.felix.gogo.runtime [1.0.6,1.0.7)
- org.apache.felix.gogo.shell [1.0.0,1.0.1)
- org.eclipse.equinox.console [1.3.0,1.3.1)
+ org.apache.felix.gogo.command [1.0.2,1.1.0)
+ org.apache.felix.gogo.runtime [1.1.0,1.2.0)
+ org.apache.felix.gogo.shell [1.1.0,1.2.0)
+ org.eclipse.equinox.console [1.4.0,1.5.0)
}
location "http://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository" {
diff --git a/releng/org.eclipse.app4mc.ide.setup/APP4MCModelMigrationDevelopmentEnvironment.setup b/releng/org.eclipse.app4mc.ide.setup/APP4MCModelMigrationDevelopmentEnvironment.setup
new file mode 100644
index 0000000..050ebe8
--- /dev/null
+++ b/releng/org.eclipse.app4mc.ide.setup/APP4MCModelMigrationDevelopmentEnvironment.setup
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<setup:Project
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
+ xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
+ xmlns:pde="http://www.eclipse.org/oomph/setup/pde/1.0"
+ xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
+ xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
+ xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
+ xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
+ xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
+ xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
+ name="app4mc.addon.migration"
+ label="APP4MC Model Migration">
+ <setupTask
+ xsi:type="jdt:JRETask"
+ version="JavaSE-1.8"
+ location="${jre.location-1.8}">
+ <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
+ </setupTask>
+ <setupTask
+ xsi:type="setup:EclipseIniTask"
+ option="-Xmx"
+ value="1024m"
+ vm="true">
+ <description>Set the heap space needed to work with the projects of ${scope.project.label}</description>
+ </setupTask>
+ <setupTask
+ xsi:type="setup:ResourceCreationTask"
+ excludedTriggers="STARTUP MANUAL"
+ content="<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
	<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
		<item value="true" key="group_libraries"/>
		<item value="false" key="linkWithEditor"/>
		<item value="2" key="layout"/>
		<item value="2" key="rootMode"/>
		<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer configured=&quot;true&quot; group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;2&quot; sortWorkingSets=&quot;false&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;localWorkingSetManager&gt;&#x0D;&#x0A;&lt;workingSet editPageId=&quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1382792884467_1&quot; label=&quot;Other Projects&quot; name=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/localWorkingSetManager&gt;&#x0D;&#x0A;&lt;activeWorkingSet workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;allWorkingSets workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
	</section>
</section>
"
+ targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
+ encoding="UTF-8">
+ <description>Initialize JDT's package explorer to show working sets as its root objects</description>
+ </setupTask>
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="eclipse.target.platform"
+ value="None"
+ defaultValue="2019-12"
+ storageURI="scope://Workspace"/>
+ <setupTask
+ xsi:type="pde:TargetPlatformTask"
+ name="Amalthea Model Migration Target"/>
+ <setupTask
+ xsi:type="setup.p2:P2Task"
+ label="Target Platform Definition DSL and Generator">
+ <requirement
+ name="org.eclipse.cbi.targetplatform-feature.feature.group"/>
+ <repository
+ url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
+ <repository
+ url="http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/"/>
+ </setupTask>
+ <setupTask
+ xsi:type="setup:CompoundTask"
+ name="User Preferences">
+ <annotation
+ source="http://www.eclipse.org/oomph/setup/UserPreferences"/>
+ <setupTask
+ xsi:type="setup:CompoundTask"
+ name="org.eclipse.pde.ds.annotations">
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.pde.ds.annotations/classpath"
+ value="true"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.pde.ds.annotations/dsVersion"
+ value="V1_3"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.pde.ds.annotations/enabled"
+ value="true"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.pde.ds.annotations/generateBundleActivationPolicyLazy"
+ value="true"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.pde.ds.annotations/path"
+ value="OSGI-INF"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.pde.ds.annotations/validationErrorLevel"
+ value="error"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.pde.ds.annotations/validationErrorLevel.missingImplicitUnbindMethod"
+ value="error"/>
+ </setupTask>
+ <setupTask
+ xsi:type="setup:CompoundTask"
+ name="org.eclipse.tm.terminal.control">
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.tm.terminal.control/TerminalPrefInvertColors"
+ value="true"/>
+ </setupTask>
+ </setupTask>
+ <setupTask
+ xsi:type="setup.p2:P2Task"
+ label="Eclipse Release Train">
+ <requirement
+ name="org.eclipse.e4.core.tools.feature.source.feature.group"/>
+ <requirement
+ name="org.eclipse.tm.terminal.feature.feature.group"/>
+ <requirement
+ name="org.eclipse.pde.source.feature.group"/>
+ <repository
+ url="http://download.eclipse.org/releases/2019-12"/>
+ </setupTask>
+ <stream name="develop"
+ label="develop">
+ <setupTask
+ xsi:type="setup:EclipseIniTask"
+ option="-Doomph.redirection.app4mc.addon.migration"
+ value="=https://git.eclipse.org/c/app4mc/org.eclipse.app4mc.addon.migration.git/plain/releng/org.eclipse.app4mc.ide.setup/APP4MCModelMigrationDevelopmentEnvironment.setup->${git.clone.app4mc.addon.migration.location|uri}/releng/org.eclipse.app4mc.ide.setup/APP4MCModelMigrationDevelopmentEnvironment.setup"
+ vm="true">
+ <description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
+ </setupTask>
+ <setupTask
+ xsi:type="git:GitCloneTask"
+ id="git.clone.app4mc.addon.migration"
+ remoteURI="app4mc/org.eclipse.app4mc.addon.migration"
+ checkoutBranch="develop">
+ <annotation
+ source="http://www.eclipse.org/oomph/setup/InducedChoices">
+ <detail
+ key="inherit">
+ <value>eclipse.git.gerrit.remoteURIs</value>
+ </detail>
+ <detail
+ key="label">
+ <value>${scope.project.label} Git repository</value>
+ </detail>
+ <detail
+ key="target">
+ <value>remoteURI</value>
+ </detail>
+ </annotation>
+ <description>${scope.project.label}</description>
+ </setupTask>
+ <setupTask
+ xsi:type="projects:ProjectsImportTask">
+ <sourceLocator
+ rootFolder="${git.clone.app4mc.addon.migration.location}"/>
+ </setupTask>
+ <setupTask
+ xsi:type="setup.workingsets:WorkingSetTask">
+ <workingSet
+ name="Converters-common">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ <operand
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.converters\.common.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.converters\.ui.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.converters\.log.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.converters\.headless.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.converters\.help.*"/>
+ </operand>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Converters-0.7.x">
+ <predicate
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.converters\.07.*"/>
+ </workingSet>
+ <workingSet
+ name="Converters-0.8.x">
+ <predicate
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.converters\.08.*"/>
+ </workingSet>
+ <workingSet
+ name="Converters-0.9.x">
+ <predicate
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.converters\.09.*"/>
+ </workingSet>
+ <workingSet
+ name="Features">
+ <predicate
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.FeatureNature"/>
+ </workingSet>
+ <workingSet
+ name="Releng">
+ <predicate
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.converters\..*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.ide\..*"/>
+ </predicate>
+ </workingSet>
+ </setupTask>
+ </stream>
+ <logicalProjectContainer
+ xsi:type="setup:ProjectCatalog"
+ href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
+ <description>Development Environment for APP4MC Model Migration.</description>
+</setup:Project>
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/META-INF/MANIFEST.MF
index 530e003..44f7580 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.7.1 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.071.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.071
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.junit;bundle-version="4.12.0"
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/TestModels/input/sw/modeswitch/modeswtich_isrs.amxmi b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/TestModels/input/sw/modeswitch/modeswtich_isrs.amxmi
index e934e39..ab581d6 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/TestModels/input/sw/modeswitch/modeswtich_isrs.amxmi
+++ b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/TestModels/input/sw/modeswitch/modeswtich_isrs.amxmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<am:Amalthea xmlns:am="http://app4mc.eclipse.org/amalthea/0.7.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmi:version="2.0">
+<am:Amalthea xmlns:am="http://app4mc.eclipse.org/amalthea/0.7.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmi:version="2.0">
<swModel>
<isrs name="ISR-8.1.3">
<callGraph>
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/RootElementConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/RootElementConverterTest.java
index c5af5e9..faaf239 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/RootElementConverterTest.java
+++ b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/RootElementConverterTest.java
@@ -52,6 +52,11 @@
super(canExecuteTestCase, xmlFileRelativeLocation);
}
+ @Override
+ public ModelVersion getOutputModelVersion() {
+ return ModelVersion._070;
+ }
+
@Test
public void testConversion() {
super.testConversion(RootElementConverter.class);
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/META-INF/MANIFEST.MF
index 1e289bc..0c32eef 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.7.2 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.072.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.072
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/META-INF/MANIFEST.MF
index 77ecc0e..dcf7545 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.8.0 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.080.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.080
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/META-INF/MANIFEST.MF
index 2360968..df282bc 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.8.1 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.081.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.081
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.082.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.082.tests/META-INF/MANIFEST.MF
index 8237112..b04c359 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.082.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.082.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.8.2 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.082.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.082
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.083.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.083.tests/META-INF/MANIFEST.MF
index 496ad79..3c7ecc4 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.083.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.083.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.8.3 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.083.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.083
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.090.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.090.tests/META-INF/MANIFEST.MF
index b69a912..a517011 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.090.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.090.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.0 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.090.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.090
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.091.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.091.tests/META-INF/MANIFEST.MF
index 8c291b6..f9639b5 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.091.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.091.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.1 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.091.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.091
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.092.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.092.tests/META-INF/MANIFEST.MF
index 7edb8b3..34ea8e7 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.092.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.092.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.2 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.092.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.092
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/META-INF/MANIFEST.MF
index e1e3a17..20b1c64 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.3 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.093.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.093
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/META-INF/MANIFEST.MF
index 9277ec1..e44b16f 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.4 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.094.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.094
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.095.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.095.tests/META-INF/MANIFEST.MF
index 55b97a9..e8592a4 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.095.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.095.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.5 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.095.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.095
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.096.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.096.tests/META-INF/MANIFEST.MF
index 5562fc0..8ed186d 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.096.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.096.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.6 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.096.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.096
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.097.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.097.tests/META-INF/MANIFEST.MF
index 388435d..4231fde 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.097.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.097.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters to 0.9.7 - Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.097.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Fragment-Host: org.eclipse.app4mc.amalthea.converters.097
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.097.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.app4mc.amalthea.converters.common.tests/META-INF/MANIFEST.MF
index 117201f..84c16b0 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.app4mc.amalthea.converters.common.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Amalthea Converters Common Tests
Bundle-SymbolicName: org.eclipse.app4mc.amalthea.converters.common.tests
-Bundle-Version: 0.9.7.qualifier
+Bundle-Version: 0.9.8.qualifier
Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.common.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse APP4MC
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.common.tests/src/org/eclipse/app4mc/amalthea/converters/common/tests/AbstractConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.common.tests/src/org/eclipse/app4mc/amalthea/converters/common/tests/AbstractConverterTest.java
index c505603..b588eae 100644
--- a/tests/org.eclipse.app4mc.amalthea.converters.common.tests/src/org/eclipse/app4mc/amalthea/converters/common/tests/AbstractConverterTest.java
+++ b/tests/org.eclipse.app4mc.amalthea.converters.common.tests/src/org/eclipse/app4mc/amalthea/converters/common/tests/AbstractConverterTest.java
@@ -14,6 +14,7 @@
package org.eclipse.app4mc.amalthea.converters.common.tests;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -32,6 +33,7 @@
import java.util.Set;
import java.util.stream.Stream;
+import org.eclipse.app4mc.amalthea.converters.common.MigrationHelper;
import org.eclipse.app4mc.amalthea.converters.common.ServiceConstants;
import org.eclipse.app4mc.amalthea.converters.common.base.ICache;
import org.eclipse.app4mc.amalthea.converters.common.base.IConverter;
@@ -84,6 +86,11 @@
Set<String> inputFiles = this.filenameInputOutputMapping.keySet();
for (String inputFilePath : inputFiles) {
File inputFile = new File(inputFilePath);
+
+ // verify that the model version of the input file matches the configured input model version
+ String modelVersion = MigrationHelper.getModelVersion(inputFile);
+ assertEquals(getInputModelVersion().getVersion(), modelVersion);
+
this.fileDocumentMapping.put(inputFile, HelperUtil.loadFile(inputFilePath));
}
}
@@ -117,6 +124,10 @@
}
}
+ // verify that the model version of the output file matches the configured output model version
+ String modelVersion = MigrationHelper.getModelVersion(targetFile);
+ assertEquals(getOutputModelVersion().getVersion(), modelVersion);
+
this.fileDocumentMapping.put(targetFile, HelperUtil.loadFile(outputFilePath));
}
