added 0.9.2 amalthea model as input + added code to convert relative path of command line arguments to absolute (based on location of input properties file)+ removed launch configuration (as it is no longer required)
diff --git a/eclipse-tools/model-transformation/examples/amlt2inchron/com.inchron.realtime.root/src/.gitignore b/eclipse-tools/model-transformation/examples/amlt2inchron/com.inchron.realtime.root/src/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/eclipse-tools/model-transformation/examples/amlt2inchron/com.inchron.realtime.root/src/.gitignore
diff --git a/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.app/src/org/eclipse/app4mc/transform/to/inchron/app/InchronApplication.java b/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.app/src/org/eclipse/app4mc/transform/to/inchron/app/InchronApplication.java
index 70471d6..b9e21d5 100644
--- a/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.app/src/org/eclipse/app4mc/transform/to/inchron/app/InchronApplication.java
+++ b/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.app/src/org/eclipse/app4mc/transform/to/inchron/app/InchronApplication.java
@@ -14,6 +14,8 @@
*/
package org.eclipse.app4mc.transform.to.inchron.app;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Properties;
@@ -30,14 +32,65 @@
public Object start(IApplicationContext context) throws Exception {
return super.start(context);
}
-
- @Override
- protected Properties getInputParameters(IApplicationContext context) throws IOException, FileNotFoundException {
- return super.getInputParameters(context);
- }
+
@Override
protected Logger getLogger(Properties inputParameters) {
return super.getLogger(inputParameters);
}
+
+ @Override
+ protected Properties getInputParameters(IApplicationContext context) throws IOException, FileNotFoundException {
+
+
+ String[] args = (String[]) context.getArguments().get("application.args");
+
+ if (args != null && args.length > 0) {
+
+ String inputPropsFile = args[1];
+
+ File propertiesFile = new File(inputPropsFile);
+
+ Properties properties = new Properties();
+
+ properties.load(new FileInputStream(propertiesFile));
+
+ //Now checking if the user has specified absolute paths in the properties file ?
+
+ Object inputModelsFolder = properties.get("input_models_folder");
+ Object outputModelsFolder = properties.get("m2m_output_folder");
+ Object logFile = properties.get("log_file");
+
+ if(inputModelsFolder !=null) {
+ String path=inputModelsFolder.toString();
+
+ String newPath=new File(path).exists()?path:new File(propertiesFile.getParent()+File.separator+ path).getCanonicalPath() ;
+
+ properties.put("input_models_folder", newPath);
+
+ }
+ if(outputModelsFolder !=null) {
+ String path=outputModelsFolder.toString();
+
+ String newPath=new File(path).exists()?path:new File(propertiesFile.getParent()+File.separator+ path).getCanonicalPath();
+
+ properties.put("m2m_output_folder", newPath);
+
+ }
+ if(logFile !=null) {
+ String path=logFile.toString();
+
+ String newPath=new File(path).exists()?path:new File(propertiesFile.getParent()+File.separator+ path).getCanonicalPath() ;
+
+ properties.put("log_file", newPath);
+
+ }
+
+
+ return properties;
+ }
+
+ return null;
+ }
+
}
diff --git a/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/Amlt2Inchron_Transformation.product.launch b/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/Amlt2Inchron_Transformation.product.launch
deleted file mode 100644
index 1845c71..0000000
--- a/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/Amlt2Inchron_Transformation.product.launch
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.app4mc.transform.to.inchron.app.application"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Amlt2Inchron_Transformation.product"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-Amlt2Inchron_Transformation.product"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog --input.props ./input.properties"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:org.eclipse.app4mc.transform.to.inchron.product}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.app4mc.transform.to.inchron.app.product"/>
-<stringAttribute key="productFile" value="\org.eclipse.app4mc.transform.to.inchron.app\Amlt2Inchron_Transformation.product"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.inject@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math3@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.scr@1:true,org.apache.log4j@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.app4mc.amalthea.model@default:default,org.eclipse.app4mc.amalthea.sphinx@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xcore.lib@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.services@1:false,org.eclipse.osgi.util@default:default,org.eclipse.osgi@1:false,org.eclipse.sphinx.emf.editors.forms@default:default,org.eclipse.sphinx.emf.editors@default:default,org.eclipse.sphinx.emf.ui@default:default,org.eclipse.sphinx.emf.workspace.ui@default:default,org.eclipse.sphinx.emf.workspace@default:default,org.eclipse.sphinx.emf@default:default,org.eclipse.sphinx.platform.ui@default:default,org.eclipse.sphinx.platform@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtext.xbase.lib@default:default,org.jdom@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,osgi.enterprise@default:true"/>
-<stringAttribute key="selected_workspace_plugins" value="com.inchron.realtime.root@default:default,org.eclipse.app4mc.transform.to.inchron.app@default:default,org.eclipse.app4mc.transform.to.inchron.m2m@default:default,org.eclipse.app4mc.transformation.application@default:default,org.eclipse.app4mc.transformation.extensions@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/input/amalthea_models/transformationExample.amxmi b/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/input/amalthea_models/transformationExample.amxmi
index c08719c..c67b9de 100644
--- a/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/input/amalthea_models/transformationExample.amxmi
+++ b/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/input/amalthea_models/transformationExample.amxmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<am:Amalthea xmlns:am="http://app4mc.eclipse.org/amalthea/0.9.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.9.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmi:version="2.0">
<swModel>
<tasks name="Task5ms" stimuli="Stimuli5msA?type=PeriodicStimulus Stimuli5msB?type=PeriodicStimulus" preemption="preemptive" multipleTaskActivationLimit="0">
<callGraph>
diff --git a/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/src/.gitignore b/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/src/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/eclipse-tools/model-transformation/examples/amlt2inchron/org.eclipse.app4mc.transform.to.inchron.product/src/.gitignore