adapted the code, so as to be consistent with latest APP4MC version
diff --git a/eclipse-tools/model-transformation/build/dev_utils/workingSets.psf b/eclipse-tools/model-transformation/build/dev_utils/workingSets.psf
index 9ea502f..fafd4c9 100644
--- a/eclipse-tools/model-transformation/build/dev_utils/workingSets.psf
+++ b/eclipse-tools/model-transformation/build/dev_utils/workingSets.psf
@@ -37,5 +37,6 @@
<item elementID="=org.eclipse.app4mc.transform.to.inchron.m2m" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
<item elementID="=org.eclipse.app4mc.transformation.3rdparty.libs" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
<item elementID="=org.eclipse.app4mc.inchron.transformation.installer" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=org.eclipse.app4mc.transform.to.inchron.product" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
</workingSets>
</psf>
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/build/org.eclipse.app4mc.inchron.transformation.installer/examples/org.eclipse.app4mc.transform.to.inchron.m2m/.gitignore b/eclipse-tools/model-transformation/build/org.eclipse.app4mc.inchron.transformation.installer/examples/org.eclipse.app4mc.transform.to.inchron.m2m/.gitignore
new file mode 100644
index 0000000..d3fb94c
--- /dev/null
+++ b/eclipse-tools/model-transformation/build/org.eclipse.app4mc.inchron.transformation.installer/examples/org.eclipse.app4mc.transform.to.inchron.m2m/.gitignore
@@ -0,0 +1,3 @@
+/bin/
+/target/
+/xtend-gen/
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/build/org.eclipse.app4mc.inchron.transformation.installer/examples/org.eclipse.app4mc.transform.to.inchron.m2m/src/configuration/M2MTransformation.java b/eclipse-tools/model-transformation/build/org.eclipse.app4mc.inchron.transformation.installer/examples/org.eclipse.app4mc.transform.to.inchron.m2m/src/configuration/M2MTransformation.java
index 611cd5e..b641726 100644
--- a/eclipse-tools/model-transformation/build/org.eclipse.app4mc.inchron.transformation.installer/examples/org.eclipse.app4mc.transform.to.inchron.m2m/src/configuration/M2MTransformation.java
+++ b/eclipse-tools/model-transformation/build/org.eclipse.app4mc.inchron.transformation.installer/examples/org.eclipse.app4mc.transform.to.inchron.m2m/src/configuration/M2MTransformation.java
@@ -20,6 +20,7 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
+import org.eclipse.app4mc.amalthea.model.AmaltheaFactory;
import org.eclipse.app4mc.transformation.extensions.executiontype.IModelToModelConfig;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -53,6 +54,10 @@
ResourceSet resourceSet = new AmaltheaMultiFileLoader().loadMultipleFiles(folderPath);
+ if(resourceSet.getResources().size()==0) {
+ logger.error("no Amalthea model files are loaded. Verify if the model version is : " + AmaltheaFactory.eINSTANCE.createAmalthea().getVersion());
+ }
+
return resourceSet;
}else{
logger.error("amalthea_models_folder parameter not set", new NullPointerException("amalthea_models_folder property not set"));
@@ -86,4 +91,10 @@
this.parameters=parameters;
}
+ @Override
+ public void setLogger(Logger logger) {
+ this.logger=logger;
+
+ }
+
}
diff --git a/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/Amlt2Inchron_Transformation.product b/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/Amlt2Inchron_Transformation.product
index a93ab84..a256d3d 100644
--- a/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/Amlt2Inchron_Transformation.product
+++ b/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/Amlt2Inchron_Transformation.product
@@ -7,7 +7,7 @@
</configIni>
<launcherArgs>
- <programArgs>--input.props ./input.properties
+ <programArgs>--input.props "${workspace_loc:org.eclipse.app4mc.transform.to.inchron.product}/input.properties"
</programArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
@@ -29,10 +29,12 @@
<plugin id="com.google.inject"/>
<plugin id="com.ibm.icu"/>
<plugin id="com.inchron.realtime.root"/>
+ <plugin id="javax.annotation"/>
<plugin id="javax.inject"/>
<plugin id="javax.xml"/>
<plugin id="org.apache.batik.css"/>
<plugin id="org.apache.batik.util"/>
+ <plugin id="org.apache.batik.util.gui"/>
<plugin id="org.apache.commons.cli"/>
<plugin id="org.apache.commons.jxpath"/>
<plugin id="org.apache.commons.lang"/>
@@ -64,8 +66,10 @@
<plugin id="org.eclipse.core.databinding.property"/>
<plugin id="org.eclipse.core.expressions"/>
<plugin id="org.eclipse.core.filesystem"/>
+ <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.resources"/>
+ <plugin id="org.eclipse.core.resources.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.core.variables"/>
<plugin id="org.eclipse.e4.core.commands"/>
@@ -73,6 +77,7 @@
<plugin id="org.eclipse.e4.core.di"/>
<plugin id="org.eclipse.e4.core.di.annotations"/>
<plugin id="org.eclipse.e4.core.di.extensions"/>
+ <plugin id="org.eclipse.e4.core.di.extensions.supplier"/>
<plugin id="org.eclipse.e4.core.services"/>
<plugin id="org.eclipse.e4.emf.xpath"/>
<plugin id="org.eclipse.e4.ui.bindings"/>
@@ -112,14 +117,21 @@
<plugin id="org.eclipse.equinox.p2.metadata.repository"/>
<plugin id="org.eclipse.equinox.p2.repository"/>
<plugin id="org.eclipse.equinox.preferences"/>
+ <plugin id="org.eclipse.equinox.region" fragment="true"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.security"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.equinox.supplement"/>
+ <plugin id="org.eclipse.equinox.transforms.hook" fragment="true"/>
<plugin id="org.eclipse.equinox.util"/>
+ <plugin id="org.eclipse.equinox.weaving.hook" fragment="true"/>
+ <plugin id="org.eclipse.fx.osgi" fragment="true"/>
<plugin id="org.eclipse.help"/>
<plugin id="org.eclipse.jface"/>
<plugin id="org.eclipse.jface.databinding"/>
<plugin id="org.eclipse.jface.text"/>
<plugin id="org.eclipse.osgi"/>
+ <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
<plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.osgi.util"/>
<plugin id="org.eclipse.sphinx.emf"/>
@@ -140,21 +152,26 @@
<plugin id="org.eclipse.ui.navigator"/>
<plugin id="org.eclipse.ui.views"/>
<plugin id="org.eclipse.ui.views.properties.tabbed"/>
+ <plugin id="org.eclipse.ui.win32" fragment="true"/>
<plugin id="org.eclipse.ui.workbench"/>
<plugin id="org.eclipse.ui.workbench.texteditor"/>
<plugin id="org.eclipse.xtend.lib"/>
<plugin id="org.eclipse.xtend.lib.macro"/>
+ <plugin id="org.eclipse.xtext.logging" fragment="true"/>
<plugin id="org.eclipse.xtext.xbase.lib"/>
<plugin id="org.jdom"/>
<plugin id="org.tukaani.xz"/>
<plugin id="org.w3c.css.sac"/>
- <plugin id="osgi.enterprise"/>
+ <plugin id="org.w3c.dom.events"/>
+ <plugin id="org.w3c.dom.smil"/>
+ <plugin id="org.w3c.dom.svg"/>
</plugins>
<configurations>
+ <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="1" />
<plugin id="org.eclipse.osgi" autoStart="false" startLevel="1" />
<plugin id="org.eclipse.osgi.services" autoStart="false" startLevel="1" />
- <plugin id="osgi.enterprise" autoStart="true" startLevel="0" />
+ <property name="equinox.use.ds" value="false" />
</configurations>
<preferencesInfo>