Updated examples and included new AMALTHEA version 0.9.0
diff --git a/eclipse-tools/model-transformation/build/org.eclipse.app4mc.transformation.build/pom.xml b/eclipse-tools/model-transformation/build/org.eclipse.app4mc.transformation.build/pom.xml
index 584b93f..2127557 100644
--- a/eclipse-tools/model-transformation/build/org.eclipse.app4mc.transformation.build/pom.xml
+++ b/eclipse-tools/model-transformation/build/org.eclipse.app4mc.transformation.build/pom.xml
@@ -14,7 +14,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<luna-repo.url>http://download.eclipse.org/releases/neon</luna-repo.url>
- <amalthea-repo.url>http://download.eclipse.org/app4mc/updatesites/releases/0.8.3/</amalthea-repo.url>
+ <amalthea-repo.url>http://download.eclipse.org/app4mc/updatesites/releases/0.9.0/</amalthea-repo.url>
<orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/</orbit-repo.url>
<sphinx-repo-url>http://download.eclipse.org/sphinx/updates/interim/</sphinx-repo-url>
@@ -96,14 +96,14 @@
<!-- example plugins -->
- <module>../../examples/sample-model-transformation/app4mc.example.transform.amalthea.application</module>
- <module>../../examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m</module>
- <module>../../examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t</module>
+ <module>../../examples/sample-model-transformation/app4mc.example.transform.app</module>
+ <module>../../examples/sample-model-transformation/app4mc.example.transform.m2m</module>
+ <module>../../examples/sample-model-transformation/app4mc.example.transform.m2t</module>
<module>../../examples/sample-model-transformation/app4mc.example.transform.samplemodel</module>
<!-- plugins -->
- <module>../../plugins/org.eclipse.app4mc.transformation.application.base</module>
+ <module>../../plugins/org.eclipse.app4mc.transformation.application</module>
<module>../../plugins/org.eclipse.app4mc.transformation.extensions</module>
diff --git a/eclipse-tools/model-transformation/build/org.eclipse.app4mc.transformation.examples.installer/plugin.xml b/eclipse-tools/model-transformation/build/org.eclipse.app4mc.transformation.examples.installer/plugin.xml
index fc00fe8..56605a1 100644
--- a/eclipse-tools/model-transformation/build/org.eclipse.app4mc.transformation.examples.installer/plugin.xml
+++ b/eclipse-tools/model-transformation/build/org.eclipse.app4mc.transformation.examples.installer/plugin.xml
@@ -25,21 +25,21 @@
wizardID="org.eclipse.app4mc.transformation.examples.TransformationWizard"
pageImage="icons/full/wizban/NewEMFExample.gif">
<projectDescriptor
- name="app4mc.example.transform.amalthea.application"
- contentURI="examples/app4mc.example.transform.amalthea.application/"
+ name="app4mc.example.transform.app"
+ contentURI="examples/app4mc.example.transform.app/"
description="Sample Application Project"/>
<projectDescriptor
- name="app4mc.example.transform.amalthea.m2m"
- contentURI="examples/app4mc.example.transform.amalthea.m2m/"
+ name="app4mc.example.transform.m2t"
+ contentURI="examples/app4mc.example.transform.m2t/"
+ description="Sample M2T project"/>
+ <projectDescriptor
+ name="app4mc.example.transform.m2m"
+ contentURI="examples/app4mc.example.transform.m2m/"
description="Sample M2M project"/>
<projectDescriptor
name="app4mc.example.transform.samplemodel"
contentURI="examples/app4mc.example.transform.samplemodel/"
description="Sample EMF model"/>
- <projectDescriptor
- name="app4mc.example.transform.amalthea.m2t"
- contentURI="examples/app4mc.example.transform.amalthea.m2t/"
- description="Sample M2T project"/>
</example>
</extension>
diff --git a/eclipse-tools/model-transformation/doc/UserGuide_APP4MC_EMF_Model_Transformation.docx b/eclipse-tools/model-transformation/doc/UserGuide_APP4MC_EMF_Model_Transformation.docx
index 59cdada..8171662 100644
--- a/eclipse-tools/model-transformation/doc/UserGuide_APP4MC_EMF_Model_Transformation.docx
+++ b/eclipse-tools/model-transformation/doc/UserGuide_APP4MC_EMF_Model_Transformation.docx
Binary files differ
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.externalToolBuilders/app4mc.example.transform.amalthea.application.launch b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.externalToolBuilders/app4mc.example.transform.amalthea.application.launch
deleted file mode 100644
index 46507d6..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.externalToolBuilders/app4mc.example.transform.amalthea.application.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples" type="2"/> </resources>}"/>
-<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples/app4mc.example.transform.amalthea.application/" type="2"/> <item path="/app4mc.example.transform.amalthea.application/.classpath" type="1"/> <item path="/app4mc.example.transform.amalthea.application/.externalToolBuilders" type="2"/> <item path="/app4mc.example.transform.amalthea.application/.gitignore" type="1"/> <item path="/app4mc.example.transform.amalthea.application/.project" type="1"/> <item path="/app4mc.example.transform.amalthea.application/.settings" type="2"/> <item path="/app4mc.example.transform.amalthea.application/APP4MC_Example_Transformation.product" type="1"/> <item path="/app4mc.example.transform.amalthea.application/APP4MC_Example_Transformation.product.launch" type="1"/> <item path="/app4mc.example.transform.amalthea.application/build.properties" type="1"/> <item path="/app4mc.example.transform.amalthea.application/input" type="2"/> <item path="/app4mc.example.transform.amalthea.application/input.properties" type="1"/> <item path="/app4mc.example.transform.amalthea.application/META-INF" type="2"/> <item path="/app4mc.example.transform.amalthea.application/output" type="2"/> <item path="/app4mc.example.transform.amalthea.application/plugin.xml" type="1"/> <item path="/app4mc.example.transform.amalthea.application/pom.xml" type="1"/> <item path="/app4mc.example.transform.amalthea.application/src" type="2"/> </resources>}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc:/app4mc.example.transform.amalthea.application}/.externalToolBuilders/copyExample.ant"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${project_loc:/app4mc.example.transform.amalthea.application}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.externalToolBuilders/copyExample.ant b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.externalToolBuilders/copyExample.ant
deleted file mode 100644
index 9b6ce8e..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.externalToolBuilders/copyExample.ant
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<project name="copyExample" default="main" basedir="../..">
-
- <property name="installer" value="org.eclipse.app4mc.transformation.examples.installer" />
- <import file="../../../../build/${installer}/copyExampleLib.ant" optional="true" />
- <basename file="${build.project}" property="project" />
-
- <target name="main">
- <copyExample project="${project}" />
- </target>
-
-</project>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.settings/org.eclipse.jdt.core.prefs b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/APP4MC_Example_Transformation.product.launch b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/APP4MC_Example_Transformation.product.launch
deleted file mode 100644
index 1ae656d..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/APP4MC_Example_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="app4mc.example.transform.amalthea.application.application"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<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/APP4MC_Example_Transformation.product"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-APP4MC_Example_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:app4mc.example.transform.amalthea.application}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.app4mc.transformation.application.base.product"/>
-<stringAttribute key="productFile" value="\app4mc.example.transform.amalthea.application\APP4MC_Example_Transformation.product"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.xml@default:default,org.apache.batik.css*1.8.0.v20170214-1941@default:default,org.apache.batik.util*1.8.0.v20170214-1941@default:default,org.apache.batik.util.gui*1.8.0.v20170214-1941@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.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.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources.win32.x86_64@default:false,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.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.osgi@default:false,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.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,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.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.wst.jsdt.nashorn.extension@default:false,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.xbase.lib@default:default,org.jdom@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="app4mc.example.transform.amalthea.application@default:default,app4mc.example.transform.amalthea.m2m@default:default,app4mc.example.transform.amalthea.m2t@default:default,app4mc.example.transform.samplemodel@default:default,org.eclipse.app4mc.transformation.application.base@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="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/META-INF/MANIFEST.MF
deleted file mode 100644
index e2aace5..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: APP4MC Transformation Example - Application
-Bundle-SymbolicName: app4mc.example.transform.amalthea.application;singleton:=true
-Bundle-Version: 0.3.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Vendor: Eclipse APP4MC
-Require-Bundle: org.eclipse.app4mc.transformation.application.base
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.externalToolBuilders/app4mc.example.transform.amalthea.m2m.launch b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.externalToolBuilders/app4mc.example.transform.amalthea.m2m.launch
deleted file mode 100644
index 3018bad..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.externalToolBuilders/app4mc.example.transform.amalthea.m2m.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples" type="2"/> </resources>}"/>
-<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples/app4mc.example.transform.amalthea.m2m/" type="2"/> <item path="/app4mc.example.transform.amalthea.m2m/.classpath" type="1"/> <item path="/app4mc.example.transform.amalthea.m2m/.externalToolBuilders" type="2"/> <item path="/app4mc.example.transform.amalthea.m2m/.gitignore" type="1"/> <item path="/app4mc.example.transform.amalthea.m2m/.project" type="1"/> <item path="/app4mc.example.transform.amalthea.m2m/.settings" type="2"/> <item path="/app4mc.example.transform.amalthea.m2m/build.properties" type="1"/> <item path="/app4mc.example.transform.amalthea.m2m/META-INF" type="2"/> <item path="/app4mc.example.transform.amalthea.m2m/plugin.xml" type="1"/> <item path="/app4mc.example.transform.amalthea.m2m/pom.xml" type="1"/> <item path="/app4mc.example.transform.amalthea.m2m/src" type="2"/> <item path="/app4mc.example.transform.amalthea.m2m/xtend-gen" type="2"/> </resources>}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc:/app4mc.example.transform.amalthea.m2m}/.externalToolBuilders/copyExample.ant"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${project_loc:/app4mc.example.transform.amalthea.m2m}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.project b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.project
deleted file mode 100644
index 8775f1a..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.project
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>app4mc.example.transform.amalthea.m2m</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>auto,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/app4mc.example.transform.amalthea.m2m.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/pom.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/pom.xml
deleted file mode 100644
index 8f7a1d8..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?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">
-
- <modelVersion>4.0.0</modelVersion>
-
-
- <parent>
- <relativePath>../../../build/org.eclipse.app4mc.transformation.build/pom.xml</relativePath>
- <groupId>org.eclipse.app4mc.transformation</groupId>
- <artifactId>org.eclipse.app4mc.transformation.build</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </parent>
-
- <properties>
- <plugin-id>app4mc.example.transform.amalthea.m2m</plugin-id>
- <examples-installer-location>../../../build/org.eclipse.app4mc.transformation.examples.installer</examples-installer-location>
- </properties>
-
-
- <artifactId>app4mc.example.transform.amalthea.m2m</artifactId>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
-
- <executions>
- <execution>
- <id>replace-build-token</id>
- <phase>generate-sources</phase>
-
- <configuration>
- <target>
- <copy todir="${examples-installer-location}/examples/${plugin-id}">
- <fileset dir="./">
- <exclude name=".externalToolBuilders/" />
- <exclude name="database/" />
- <exclude name="bin/" />
- <exclude name="target/" />
- <exclude name=".settings/org.eclipse.mylyn*" />
- <exclude name=".settings/org.eclipse.pde.api.tools.prefs" />
- <exclude name="**/.gitignore" />
- <exclude name="**/pom.xml" />
- <exclude name="**/release.*" />
- <include name="**" />
- </fileset>
- </copy>
-
- <replaceregexp file="${examples-installer-location}/examples/${plugin-id}/.project"
- byline="false"
- flags="sg"
- match="\s*<buildCommand>\s+<name>org.eclipse.ui.externaltools.ExternalToolBuilder.*?</buildCommand>"
- replace="" />
-
- <replaceregexp file="${examples-installer-location}/examples/${plugin-id}/.project"
- byline="false"
- flags="s"
- match="\s*<buildCommand>\s+<name>org.eclipse.pde.api.tools.apiAnalysisBuilder.*?</buildCommand>"
- replace="" />
-
- <replaceregexp file="${examples-installer-location}/examples/${plugin-id}/.project"
- byline="false"
- flags="s"
- match="\s*<buildCommand>\s+<name>org.eclipse.emf.cdo.releng.version.VersionBuilder.*?</buildCommand>"
- replace="" />
-
- <replaceregexp file="${examples-installer-location}/examples/${plugin-id}/.project"
- byline="false"
- flags="s"
- match="\s*<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>"
- replace="" />
-
- <replaceregexp file="${examples-installer-location}/examples/${plugin-id}/.project"
- byline="false"
- flags="s"
- match="\s*<nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature>"
- replace="" />
- </target>
- </configuration>
-
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>auto-clean</id>
- <phase>clean</phase>
-
- <configuration>
- <target>
- <delete dir="${examples-installer-location}/examples/${plugin-id}"/>
- </target>
- </configuration>
-
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
-
- </plugin>
-
-
- <plugin>
-<groupId>org.eclipse.xtend</groupId>
-<artifactId>xtend-maven-plugin</artifactId>
-<version>2.13.0</version>
-<executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>xtend-install-debug-info</goal>
- <goal>testCompile</goal>
- <goal>xtend-test-install-debug-info</goal>
- </goals>
- </execution>
-</executions>
-<configuration>
- <outputDirectory>xtend-gen</outputDirectory>
-</configuration>
-</plugin>
-
-
-
-
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.externalToolBuilders/app4mc.example.transform.amalthea.m2t.launch b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.externalToolBuilders/app4mc.example.transform.amalthea.m2t.launch
deleted file mode 100644
index afaadcc..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.externalToolBuilders/app4mc.example.transform.amalthea.m2t.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples" type="2"/> </resources>}"/>
-<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples/app4mc.example.transform.amalthea.m2t/" type="2"/> <item path="/app4mc.example.transform.amalthea.m2t/.classpath" type="1"/> <item path="/app4mc.example.transform.amalthea.m2t/.externalToolBuilders" type="2"/> <item path="/app4mc.example.transform.amalthea.m2t/.gitignore" type="1"/> <item path="/app4mc.example.transform.amalthea.m2t/.project" type="1"/> <item path="/app4mc.example.transform.amalthea.m2t/.settings" type="2"/> <item path="/app4mc.example.transform.amalthea.m2t/build.properties" type="1"/> <item path="/app4mc.example.transform.amalthea.m2t/META-INF" type="2"/> <item path="/app4mc.example.transform.amalthea.m2t/plugin.xml" type="1"/> <item path="/app4mc.example.transform.amalthea.m2t/pom.xml" type="1"/> <item path="/app4mc.example.transform.amalthea.m2t/src" type="2"/> <item path="/app4mc.example.transform.amalthea.m2t/xtend-gen" type="2"/> </resources>}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc:/app4mc.example.transform.amalthea.m2t}/.externalToolBuilders/copyExample.ant"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${project_loc:/app4mc.example.transform.amalthea.m2t}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.classpath b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.classpath
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.classpath
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.classpath
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.externalToolBuilders/app4mc.example.transform.app.launch b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.externalToolBuilders/app4mc.example.transform.app.launch
new file mode 100644
index 0000000..68e749c
--- /dev/null
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.externalToolBuilders/app4mc.example.transform.app.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples" type="2"/> </resources>}"/>
+<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples/app4mc.example.transform.app/" type="2"/> <item path="/app4mc.example.transform.app/.classpath" type="1"/> <item path="/app4mc.example.transform.app/.externalToolBuilders" type="2"/> <item path="/app4mc.example.transform.app/.gitignore" type="1"/> <item path="/app4mc.example.transform.app/.project" type="1"/> <item path="/app4mc.example.transform.app/.settings" type="2"/> <item path="/app4mc.example.transform.app/APP4MC_Example_Transformation.product" type="1"/> <item path="/app4mc.example.transform.app/APP4MC_Example_Transformation.product.launch" type="1"/> <item path="/app4mc.example.transform.app/build.properties" type="1"/> <item path="/app4mc.example.transform.app/input" type="2"/> <item path="/app4mc.example.transform.app/input.properties" type="1"/> <item path="/app4mc.example.transform.app/META-INF" type="2"/> <item path="/app4mc.example.transform.app/output" type="2"/> <item path="/app4mc.example.transform.app/plugin.xml" type="1"/> <item path="/app4mc.example.transform.app/pom.xml" type="1"/> <item path="/app4mc.example.transform.app/src" type="2"/> </resources>}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc:/app4mc.example.transform.app}/.externalToolBuilders/copyExample.ant"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${project_loc:/app4mc.example.transform.app}"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.externalToolBuilders/copyExample.ant b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.externalToolBuilders/copyExample.ant
similarity index 100%
copy from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.externalToolBuilders/copyExample.ant
copy to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.externalToolBuilders/copyExample.ant
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.gitignore b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.gitignore
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.gitignore
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.gitignore
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.project b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.project
similarity index 90%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.project
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.project
index a46bd91..fd4936a 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/.project
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>app4mc.example.transform.amalthea.application</name>
+ <name>app4mc.example.transform.app</name>
<comment></comment>
<projects>
</projects>
@@ -26,7 +26,7 @@
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/app4mc.example.transform.amalthea.application.launch</value>
+ <value><project>/.externalToolBuilders/app4mc.example.transform.app.launch</value>
</dictionary>
<dictionary>
<key>incclean</key>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.settings/org.eclipse.jdt.core.prefs b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
copy from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.settings/org.eclipse.jdt.core.prefs
copy to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/.settings/org.eclipse.jdt.core.prefs
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/APP4MC_Example_Transformation.product b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/APP4MC_Example_Transformation.product
similarity index 90%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/APP4MC_Example_Transformation.product
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/APP4MC_Example_Transformation.product
index 22fdb90..29445c4 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/APP4MC_Example_Transformation.product
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/APP4MC_Example_Transformation.product
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="APP4MCTransformation" uid="test" id="org.eclipse.app4mc.transformation.application.base.product" application="app4mc.example.transform.amalthea.application.application" version="1" useFeatures="false" includeLaunchers="true">
-
+<product name="APP4MC Example Transformation" uid="test" id="org.eclipse.app4mc.transformation.application.product" application="app4mc.example.transform.app.application" version="1" useFeatures="false" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -16,24 +15,20 @@
<windowImages/>
-
<launcher>
<win useIco="false">
<bmp/>
</win>
</launcher>
-
<vm>
</vm>
-
<plugins>
- <plugin id="app4mc.example.transform.amalthea.application"/>
- <plugin id="app4mc.example.transform.amalthea.m2m"/>
- <plugin id="app4mc.example.transform.amalthea.m2t"/>
+ <plugin id="app4mc.example.transform.app"/>
+ <plugin id="app4mc.example.transform.m2m"/>
+ <plugin id="app4mc.example.transform.m2t"/>
<plugin id="app4mc.example.transform.samplemodel"/>
- <plugin id="org.eclipse.app4mc.amalthea.model"/>
<plugin id="com.google.guava"/>
<plugin id="com.google.inject"/>
<plugin id="com.ibm.icu"/>
@@ -48,12 +43,16 @@
<plugin id="org.apache.commons.lang"/>
<plugin id="org.apache.commons.logging"/>
<plugin id="org.apache.commons.math3"/>
+ <plugin id="org.apache.felix.gogo.command"/>
+ <plugin id="org.apache.felix.gogo.runtime"/>
<plugin id="org.apache.log4j"/>
<plugin id="org.apache.xerces"/>
<plugin id="org.apache.xml.resolver"/>
<plugin id="org.apache.xml.serializer"/>
+ <plugin id="org.eclipse.app4mc.amalthea.model"/>
+ <plugin id="org.eclipse.app4mc.amalthea.model.test" fragment="true"/>
<plugin id="org.eclipse.app4mc.amalthea.sphinx"/>
- <plugin id="org.eclipse.app4mc.transformation.application.base"/>
+ <plugin id="org.eclipse.app4mc.transformation.application"/>
<plugin id="org.eclipse.app4mc.transformation.extensions"/>
<plugin id="org.eclipse.compare.core"/>
<plugin id="org.eclipse.core.commands"/>
@@ -63,13 +62,11 @@
<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.java7" fragment="true"/>
<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.runtime.compatibility.registry" fragment="true"/>
<plugin id="org.eclipse.core.variables"/>
<plugin id="org.eclipse.e4.core.commands"/>
<plugin id="org.eclipse.e4.core.contexts"/>
@@ -153,7 +150,9 @@
<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.hamcrest.core"/>
<plugin id="org.jdom"/>
+ <plugin id="org.junit"/>
<plugin id="org.tukaani.xz"/>
<plugin id="org.w3c.css.sac"/>
<plugin id="org.w3c.dom.events"/>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..1bf8c14
--- /dev/null
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: APP4MC Transformation Example - Application
+Bundle-SymbolicName: app4mc.example.transform.app;singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Vendor: Eclipse APP4MC
+Require-Bundle: org.eclipse.app4mc.transformation.application
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/build.properties b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/build.properties
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/build.properties
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/build.properties
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/input.properties b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/input.properties
similarity index 61%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/input.properties
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/input.properties
index 0811767..d394686 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/input.properties
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/input.properties
@@ -2,4 +2,4 @@
m2m_output_folder=./output/m2m_output_models
m2t_output_folder=./output/m2t_output_text_files
log_file=./output/transformation.txt
-tranformationConfigIDs=app4mc.example.transform.amalthea.m2m.config;app4mc.example.transform.amalthea.m2t.config
\ No newline at end of file
+tranformationConfigIDs=app4mc.example.transform.m2m.config;app4mc.example.transform.m2t.config
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/input/amalthea_models/democar.amxmi b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/input/amalthea_models/democar.amxmi
similarity index 64%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/input/amalthea_models/democar.amxmi
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/input/amalthea_models/democar.amxmi
index ae14774..0469458 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/input/amalthea_models/democar.amxmi
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/input/amalthea_models/democar.amxmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<am:Amalthea xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:am="http://app4mc.eclipse.org/amalthea/0.8.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<am:Amalthea xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:am="http://app4mc.eclipse.org/amalthea/0.9.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<commonElements>
<tags name="SwcEngineController" tagType="SOFTWARE_COMPONENT"/>
<tags name="SwcActuators" tagType="SOFTWARE_COMPONENT"/>
@@ -88,15 +88,17 @@
<runnableItems xsi:type="am:LabelAccess" data="VotedVehicleSpeed?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="VotedWheelSpeed?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="ArbitratedBrakeForce?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="ABSActivation?type=Label" access="write" dataStability="inherited"/>
@@ -105,15 +107,17 @@
<runnables name="APedSensor" tags="SwcEngineSensors?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="APedSensor1Voltage?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="APedSensor2Voltage?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="APedPosition1?type=Label" access="write" dataStability="inherited"/>
@@ -122,30 +126,34 @@
<runnables name="APedVoter" tags="SwcEngineController?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="APedPosition1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="APedPosition2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="VotedAPedPosition?type=Label" access="write" dataStability="inherited"/>
</runnables>
<runnables name="BaseFuelMass" tags="SwcEngineController?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="MassAirFlow?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="BaseFuelMassPerStroke?type=Label" access="write" dataStability="inherited"/>
@@ -153,15 +161,17 @@
</runnables>
<runnables name="BrakeActuator" tags="SwcABSCalculation?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="CaliperPosition?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="BrakeForceVoltage?type=Label" access="write" dataStability="inherited"/>
@@ -169,30 +179,34 @@
<runnables name="BrakeActuatorMonitor" tags="SwcBrakeForceCalculation?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="BrakeForce?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="BrakeForceFeedback?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
</runnables>
<runnables name="BrakeForceActuation" tags="SwcABSCalculation?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="ABSActivation?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="ABSMode?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="BrakeForce?type=Label" access="write" dataStability="inherited"/>
@@ -201,15 +215,17 @@
<runnables name="BrakeForceArbiter" tags="SwcBrakeForceArbiter?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="CalculatedBrakeForce?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="BrakeSafetyState?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="ArbitratedBrakeForce?type=Label" access="write" dataStability="inherited"/>
@@ -220,15 +236,17 @@
<runnableItems xsi:type="am:LabelAccess" data="ArbitratedDiagnosisRequest?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="MonitoredVehicleState?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="BrakeSafetyLevel?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="CalculatedBrakeForce?type=Label" access="write" dataStability="inherited"/>
@@ -237,30 +255,34 @@
<runnables name="BrakePedalSensorDiagnosis" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="BrakePedalPositionVoltage1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="BrakePedalPositionVoltage2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
</runnables>
<runnables name="BrakePedalSensorTranslation" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="BrakePedalPositionVoltage1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="BrakePedalPositionVoltage2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="BrakePedalPosition1?type=Label" access="write" dataStability="inherited"/>
@@ -269,15 +291,17 @@
<runnables name="BrakePedalSensorVoter" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="BrakePedalPosition1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="BrakePedalPosition2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="VotedBrakePedalPosition?type=Label" access="write" dataStability="inherited"/>
@@ -288,15 +312,17 @@
<runnableItems xsi:type="am:LabelAccess" data="ArbitratedDiagnosisRequest?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="MonitoredVehicleState?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="BrakeMonitorLevel?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="BrakeSafetyLevel?type=Label" access="write" dataStability="inherited"/>
@@ -305,45 +331,51 @@
<runnables name="CaliperPositionCalculation" tags="SwcABSCalculation?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="CaliperPosition?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="BrakeForceCurrent?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="CaliperPosition?type=Label" access="write" dataStability="inherited"/>
</runnables>
<runnables name="CheckPlausability" tags="SwcBrakeForceCalculation?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="VotedBrakePedalPosition?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="BrakePedalPosition?type=Label" access="write" dataStability="inherited"/>
</runnables>
<runnables name="CylNumObserver" tags="SwcCylNumObserver?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="CylinderNumber?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="TriggeredCylinderNumber?type=Label" access="write" dataStability="inherited"/>
@@ -351,30 +383,34 @@
<runnables name="DecelerationSensorDiagnosis" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="DecelerationVoltage1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="DecelerationVoltage2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
</runnables>
<runnables name="DecelerationSensorTranslation" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="DecelerationVoltage1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="DecelerationVoltage2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="DecelerationRate1?type=Label" access="write" dataStability="inherited"/>
@@ -383,72 +419,82 @@
<runnables name="DecelerationSensorVoter" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="DecelerationRate1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="DecelerationRate2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="VotedDecelerationRate?type=Label" access="write" dataStability="inherited"/>
</runnables>
<runnables name="DiagnosisArbiter" tags="SwcBrakeForceCalculation?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="ArbitratedDiagnosisRequest?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
</runnables>
<runnables name="EcuBrakeActuator" tags="SwcActuators?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="BrakeForceVoltage?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
</runnables>
<runnables name="EcuBrakePedalSensor" tags="SwcSensors?type=Tag" callback="false" service="false">
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="144000"/>
- <upperBound xsi:type="am:LongObject" value="176000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="160000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="144000"/>
+ <upperBound xsi:type="am:LongObject" value="176000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="160000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="BrakePedalPositionVoltage1?type=Label" access="write" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="BrakePedalPositionVoltage2?type=Label" access="write" dataStability="inherited"/>
</runnables>
<runnables name="EcuDecelerationSensor" tags="SwcSensors?type=Tag" callback="false" service="false">
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="144000"/>
- <upperBound xsi:type="am:LongObject" value="176000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="160000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="144000"/>
+ <upperBound xsi:type="am:LongObject" value="176000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="160000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="DecelerationVoltage1?type=Label" access="write" dataStability="inherited"/>
@@ -456,43 +502,49 @@
</runnables>
<runnables name="EcuStopLightActuator" tags="SwcActuators?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="BrakeApplication?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
</runnables>
<runnables name="EcuVehicleSpeedSensor" tags="SwcSensors?type=Tag" callback="false" service="false">
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="VehicleSpeedVoltage1?type=Label" access="write" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="VehicleSpeedVoltage2?type=Label" access="write" dataStability="inherited"/>
</runnables>
<runnables name="EcuWheelSpeedSensor" tags="SwcSensors?type=Tag" callback="false" service="false">
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="WheelSpeedVoltage1?type=Label" access="write" dataStability="inherited"/>
@@ -507,15 +559,17 @@
<runnableItems xsi:type="am:LabelAccess" data="IgnitionTime4?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="IgnitionTime5?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="IgnitionTime6?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="IgnitionTime7?type=Label" access="write" dataStability="inherited"/>
@@ -523,15 +577,17 @@
</runnables>
<runnables name="IgnitionTiming" tags="SwcEngineController?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="MAFRate?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="IgnitionTime?type=Label" access="write" dataStability="inherited"/>
@@ -547,59 +603,67 @@
<runnableItems xsi:type="am:LabelAccess" data="InjectionTime6?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="InjectionTime7?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="InjectionTime8?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
</runnables>
<runnables name="MassAirFlowSensor" tags="SwcEngineSensors?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="MAFSensorVoltage?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="MassAirFlow?type=Label" access="write" dataStability="inherited"/>
</runnables>
<runnables name="StopLightActuator" tags="SwcABSCalculation?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="ArbitratedBrakeForce?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="BrakeApplication?type=Label" access="write" dataStability="inherited"/>
</runnables>
<runnables name="ThrottleActuator" tags="SwcEngineController?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="DesiredThrottlePosition?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="DesiredThrottlePositionVoltage?type=Label" access="write" dataStability="inherited"/>
@@ -607,15 +671,17 @@
<runnables name="ThrottleController" tags="SwcEngineController?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="VotedAPedPosition?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="ThrottlePosition?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="DesiredThrottlePosition?type=Label" access="write" dataStability="inherited"/>
@@ -623,45 +689,51 @@
<runnables name="ThrottleSensor" tags="SwcEngineSensors?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="ThrottleSensor1Voltage?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="ThrottleSensor2Voltage?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="ThrottlePosition?type=Label" access="write" dataStability="inherited"/>
</runnables>
<runnables name="TotalFuelMass" tags="SwcEngineController?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="TransientFuelMassPerStroke?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="TotalFuelMassPerStroke?type=Label" access="write" dataStability="inherited"/>
</runnables>
<runnables name="TransientFuelMass" tags="SwcEngineController?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="BaseFuelMassPerStroke?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="TransientFuelMassPerStroke?type=Label" access="write" dataStability="inherited"/>
@@ -669,30 +741,34 @@
<runnables name="VehicleSpeedSensorDiagnosis" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="VehicleSpeedVoltage1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="VehicleSpeedVoltage2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
</runnables>
<runnables name="VehicleSpeedSensorTranslation" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="VehicleSpeedVoltage1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="VehicleSpeedVoltage2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="VehicleSpeed1?type=Label" access="write" dataStability="inherited"/>
@@ -701,29 +777,33 @@
<runnables name="VehicleSpeedSensorVoter" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="VehicleSpeed1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="VehicleSpeed2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="VotedVehicleSpeed?type=Label" access="write" dataStability="inherited"/>
</runnables>
<runnables name="VehicleStateMonitor" tags="SwcBrakeForceCalculation?type=Tag" callback="false" service="false">
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="MonitoredVehicleState?type=Label" access="write" dataStability="inherited"/>
@@ -731,30 +811,34 @@
<runnables name="WheelSpeedSensorDiagnosis" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="WheelSpeedVoltage1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="WheelSpeedVoltage2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
</runnables>
<runnables name="WheelSpeedSensorTranslation" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="WheelSpeedVoltage1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="WheelSpeedVoltage2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="WheelSpeed1?type=Label" access="write" dataStability="inherited"/>
@@ -763,15 +847,17 @@
<runnables name="WheelSpeedSensorVoter" tags="SwcSensorPostprocessing?type=Tag" callback="false" service="false">
<runnableItems xsi:type="am:LabelAccess" data="WheelSpeed1?type=Label" access="read" dataStability="inherited"/>
<runnableItems xsi:type="am:LabelAccess" data="WheelSpeed2?type=Label" access="read" dataStability="inherited"/>
- <runnableItems xsi:type="am:RunnableInstructions">
- <default xsi:type="am:InstructionsDeviation">
- <deviation>
- <lowerBound xsi:type="am:LongObject" value="72000"/>
- <upperBound xsi:type="am:LongObject" value="88000"/>
- <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
- <mean xsi:type="am:LongObject" value="80000"/>
- </distribution>
- </deviation>
+ <runnableItems xsi:type="am:ExecutionNeed">
+ <default key="Instructions">
+ <value xsi:type="am:NeedDeviation">
+ <deviation>
+ <lowerBound xsi:type="am:LongObject" value="72000"/>
+ <upperBound xsi:type="am:LongObject" value="88000"/>
+ <distribution xsi:type="am:WeibullEstimators" pRemainPromille="0.5">
+ <mean xsi:type="am:LongObject" value="80000"/>
+ </distribution>
+ </deviation>
+ </value>
</default>
</runnableItems>
<runnableItems xsi:type="am:LabelAccess" data="VotedWheelSpeed?type=Label" access="write" dataStability="inherited"/>
@@ -990,13 +1076,37 @@
<size value="16" unit="bit"/>
</labels>
</swModel>
-
+ <hwModel>
+ <definitions xsi:type="am:ProcessingUnitDefinition" name="DefaultCore" puType="CPU" features="Instructions/IPC_1?type=HwFeature"/>
+ <definitions xsi:type="am:MemoryDefinition" name="DefaultMemory">
+ <size value="4" unit="MB"/>
+ <accessLatency xsi:type="am:LatencyConstant" cycles="2"/>
+ </definitions>
+ <featureCategories name="Instructions" featureType="performance">
+ <features name="IPC_1" value="1.0"/>
+ </featureCategories>
+ <structures name="Democar" structureType="System">
+ <structures name="ECU_1" structureType="ECU">
+ <structures name="Microcontroller_1" structureType="Microcontroller">
+ <modules xsi:type="am:Memory" name="Mem_1" frequencyDomain="FrequencyDomain_1?type=FrequencyDomain" definition="DefaultMemory?type=MemoryDefinition">
+ <ports name="port" bitWidth="32" priority="0" portType="responder"/>
+ </modules>
+ <modules xsi:type="am:ProcessingUnit" name="Core_1" frequencyDomain="FrequencyDomain_1?type=FrequencyDomain" definition="DefaultCore?type=ProcessingUnitDefinition">
+ <ports name="port" bitWidth="32" priority="0" portType="initiator"/>
+ </modules>
+ <connections name="con1" port1="Core_1/port?type=HwPort" port2="Mem_1/port?type=HwPort"/>
+ </structures>
+ </structures>
+ </structures>
+ <domains xsi:type="am:FrequencyDomain" name="FrequencyDomain_1" clockGating="false">
+ <defaultValue value="200.0" unit="MHz"/>
+ </domains>
+ </hwModel>
<osModel>
<operatingSystems name="OperatingSystem">
<taskSchedulers name="Task_Scheduler_Core_1">
<schedulingAlgorithm xsi:type="am:OSEK"/>
</taskSchedulers>
- <osDataConsistency/>
</operatingSystems>
</osModel>
<stimuliModel>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/plugin.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/plugin.xml
similarity index 75%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/plugin.xml
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/plugin.xml
index 7e320da..a03dc2a 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/plugin.xml
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/plugin.xml
@@ -7,7 +7,7 @@
<application
visible="true">
<run
- class="org.eclipse.app4mc.transformation.application.sample.SampleApplication">
+ class="app4mc.example.transform.app.SampleApplication">
</run>
</application>
</extension>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/pom.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/pom.xml
similarity index 95%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/pom.xml
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/pom.xml
index b7975fd..3c0c6aa 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/pom.xml
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/pom.xml
@@ -13,12 +13,12 @@
</parent>
<properties>
- <plugin-id>app4mc.example.transform.amalthea.application</plugin-id>
+ <plugin-id>app4mc.example.transform.app</plugin-id>
<examples-installer-location>../../../build/org.eclipse.app4mc.transformation.examples.installer</examples-installer-location>
</properties>
- <artifactId>app4mc.example.transform.amalthea.application</artifactId>
+ <artifactId>app4mc.example.transform.app</artifactId>
<packaging>jar</packaging>
<build>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/src/org/eclipse/app4mc/transformation/application/sample/SampleApplication.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/src/app4mc/example/transform/app/SampleApplication.java
similarity index 94%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/src/org/eclipse/app4mc/transformation/application/sample/SampleApplication.java
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/src/app4mc/example/transform/app/SampleApplication.java
index d78c8f0..997bf7e 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.application/src/org/eclipse/app4mc/transformation/application/sample/SampleApplication.java
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/src/app4mc/example/transform/app/SampleApplication.java
@@ -9,7 +9,7 @@
* Robert Bosch GmbH - initial API and implementation
*******************************************************************************/
-package org.eclipse.app4mc.transformation.application.sample;
+package app4mc.example.transform.app;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.classpath b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.classpath
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.classpath
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.classpath
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.externalToolBuilders/app4mc.example.transform.m2m.launch b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.externalToolBuilders/app4mc.example.transform.m2m.launch
new file mode 100644
index 0000000..3df853a
--- /dev/null
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.externalToolBuilders/app4mc.example.transform.m2m.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples" type="2"/> </resources>}"/>
+<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples/app4mc.example.transform.m2m/" type="2"/> <item path="/app4mc.example.transform.m2m/.classpath" type="1"/> <item path="/app4mc.example.transform.m2m/.externalToolBuilders" type="2"/> <item path="/app4mc.example.transform.m2m/.gitignore" type="1"/> <item path="/app4mc.example.transform.m2m/.project" type="1"/> <item path="/app4mc.example.transform.m2m/.settings" type="2"/> <item path="/app4mc.example.transform.m2m/build.properties" type="1"/> <item path="/app4mc.example.transform.m2m/META-INF" type="2"/> <item path="/app4mc.example.transform.m2m/plugin.xml" type="1"/> <item path="/app4mc.example.transform.m2m/pom.xml" type="1"/> <item path="/app4mc.example.transform.m2m/src" type="2"/> <item path="/app4mc.example.transform.m2m/xtend-gen" type="2"/> </resources>}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc:/app4mc.example.transform.m2m}/.externalToolBuilders/copyExample.ant"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${project_loc:/app4mc.example.transform.m2m}"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.externalToolBuilders/copyExample.ant b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.externalToolBuilders/copyExample.ant
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.externalToolBuilders/copyExample.ant
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.externalToolBuilders/copyExample.ant
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.gitignore b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.gitignore
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.gitignore
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.gitignore
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.project b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.project
similarity index 92%
copy from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.project
copy to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.project
index e366dbe..c0d8489 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.project
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>app4mc.example.transform.amalthea.m2t</name>
+ <name>app4mc.example.transform.m2m</name>
<comment></comment>
<projects>
</projects>
@@ -31,7 +31,7 @@
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/app4mc.example.transform.amalthea.m2t.launch</value>
+ <value><project>/.externalToolBuilders/app4mc.example.transform.m2m.launch</value>
</dictionary>
<dictionary>
<key>incclean</key>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.settings/org.eclipse.jdt.core.prefs b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/.settings/org.eclipse.jdt.core.prefs
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/.settings/org.eclipse.jdt.core.prefs
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/META-INF/MANIFEST.MF
similarity index 86%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/META-INF/MANIFEST.MF
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/META-INF/MANIFEST.MF
index 68ca9f7..fc78761 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/META-INF/MANIFEST.MF
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Transformation Example - M2M
-Bundle-SymbolicName: app4mc.example.transform.amalthea.m2m;singleton:=true
+Bundle-SymbolicName: app4mc.example.transform.m2m;singleton:=true
Bundle-Version: 0.3.0.qualifier
Bundle-Vendor: Eclipse APP4MC
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/build.properties b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/build.properties
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/build.properties
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/build.properties
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/plugin.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/plugin.xml
similarity index 84%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/plugin.xml
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/plugin.xml
index 505f731..1aeb4ab 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/plugin.xml
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/plugin.xml
@@ -5,7 +5,7 @@
point="org.eclipse.app4mc.transformation.configuration">
<config
enabled="true"
- id="app4mc.example.transform.amalthea.m2m.config"
+ id="app4mc.example.transform.m2m.config"
m2m_class="configuration.M2MTransformation"
module_class="module.DefaultM2MInjectorModule">
</config>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/pom.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/pom.xml
similarity index 96%
copy from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/pom.xml
copy to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/pom.xml
index baee8df..9960cc9 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/pom.xml
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/pom.xml
@@ -13,12 +13,12 @@
</parent>
<properties>
- <plugin-id>app4mc.example.transform.amalthea.m2t</plugin-id>
+ <plugin-id>app4mc.example.transform.m2m</plugin-id>
<examples-installer-location>../../../build/org.eclipse.app4mc.transformation.examples.installer</examples-installer-location>
</properties>
- <artifactId>app4mc.example.transform.amalthea.m2t</artifactId>
+ <artifactId>app4mc.example.transform.m2m</artifactId>
<packaging>jar</packaging>
<build>
@@ -106,7 +106,8 @@
</plugin>
- <plugin>
+
+ <plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<version>2.13.0</version>
@@ -124,6 +125,10 @@
<outputDirectory>xtend-gen</outputDirectory>
</configuration>
</plugin>
+
+
+
+
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/configuration/M2MTransformation.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/configuration/M2MTransformation.java
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/configuration/M2MTransformation.java
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/configuration/M2MTransformation.java
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/model/loader/AmaltheaMultiFileLoader.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/model/loader/AmaltheaMultiFileLoader.java
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/model/loader/AmaltheaMultiFileLoader.java
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/model/loader/AmaltheaMultiFileLoader.java
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/module/DefaultM2MInjectorModule.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/module/DefaultM2MInjectorModule.java
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/module/DefaultM2MInjectorModule.java
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/module/DefaultM2MInjectorModule.java
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/HWTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/HWTransformer.xtend
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/HWTransformer.xtend
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/HWTransformer.xtend
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/LabelTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/LabelTransformer.xtend
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/LabelTransformer.xtend
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/LabelTransformer.xtend
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/MappingTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/MappingTransformer.xtend
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/MappingTransformer.xtend
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/MappingTransformer.xtend
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/OSTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/OSTransformer.xtend
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/OSTransformer.xtend
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/OSTransformer.xtend
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/SWTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/SWTransformer.xtend
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2m/src/templates/SWTransformer.xtend
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/SWTransformer.xtend
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.classpath b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.classpath
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.classpath
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.classpath
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.externalToolBuilders/app4mc.example.transform.m2t.launch b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.externalToolBuilders/app4mc.example.transform.m2t.launch
new file mode 100644
index 0000000..5e920f0
--- /dev/null
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.externalToolBuilders/app4mc.example.transform.m2t.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples" type="2"/> </resources>}"/>
+<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.app4mc.transformation.examples.installer/examples/app4mc.example.transform.m2t/" type="2"/> <item path="/app4mc.example.transform.m2t/.classpath" type="1"/> <item path="/app4mc.example.transform.m2t/.externalToolBuilders" type="2"/> <item path="/app4mc.example.transform.m2t/.gitignore" type="1"/> <item path="/app4mc.example.transform.m2t/.project" type="1"/> <item path="/app4mc.example.transform.m2t/.settings" type="2"/> <item path="/app4mc.example.transform.m2t/build.properties" type="1"/> <item path="/app4mc.example.transform.m2t/META-INF" type="2"/> <item path="/app4mc.example.transform.m2t/plugin.xml" type="1"/> <item path="/app4mc.example.transform.m2t/pom.xml" type="1"/> <item path="/app4mc.example.transform.m2t/src" type="2"/> <item path="/app4mc.example.transform.m2t/xtend-gen" type="2"/> </resources>}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc:/app4mc.example.transform.m2t}/.externalToolBuilders/copyExample.ant"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${project_loc:/app4mc.example.transform.m2t}"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.externalToolBuilders/copyExample.ant b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.externalToolBuilders/copyExample.ant
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.externalToolBuilders/copyExample.ant
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.externalToolBuilders/copyExample.ant
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.gitignore b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.gitignore
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.gitignore
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.gitignore
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.project b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.project
similarity index 92%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.project
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.project
index e366dbe..fed83d7 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.project
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>app4mc.example.transform.amalthea.m2t</name>
+ <name>app4mc.example.transform.m2t</name>
<comment></comment>
<projects>
</projects>
@@ -31,7 +31,7 @@
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/app4mc.example.transform.amalthea.m2t.launch</value>
+ <value><project>/.externalToolBuilders/app4mc.example.transform.m2t.launch</value>
</dictionary>
<dictionary>
<key>incclean</key>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.settings/org.eclipse.jdt.core.prefs b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/.settings/org.eclipse.jdt.core.prefs
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/.settings/org.eclipse.jdt.core.prefs
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/META-INF/MANIFEST.MF
similarity index 86%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/META-INF/MANIFEST.MF
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/META-INF/MANIFEST.MF
index e66bcab..09344bd 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/META-INF/MANIFEST.MF
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Transformation Example - M2T
-Bundle-SymbolicName: app4mc.example.transform.amalthea.m2t;singleton:=true
+Bundle-SymbolicName: app4mc.example.transform.m2t;singleton:=true
Bundle-Version: 0.3.0.qualifier
Bundle-Vendor: Eclipse APP4MC
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/build.properties b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/build.properties
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/build.properties
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/build.properties
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/plugin.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/plugin.xml
similarity index 84%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/plugin.xml
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/plugin.xml
index 0224827..2ed4b19 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/plugin.xml
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/plugin.xml
@@ -5,7 +5,7 @@
point="org.eclipse.app4mc.transformation.configuration">
<config
enabled="true"
- id="app4mc.example.transform.amalthea.m2t.config"
+ id="app4mc.example.transform.m2t.config"
m2t_class="configuration.M2TTransformation"
module_class="module.DefaultM2TInjectorModule">
</config>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/pom.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/pom.xml
similarity index 96%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/pom.xml
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/pom.xml
index baee8df..e170d50 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/pom.xml
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/pom.xml
@@ -13,12 +13,12 @@
</parent>
<properties>
- <plugin-id>app4mc.example.transform.amalthea.m2t</plugin-id>
+ <plugin-id>app4mc.example.transform.m2t</plugin-id>
<examples-installer-location>../../../build/org.eclipse.app4mc.transformation.examples.installer</examples-installer-location>
</properties>
- <artifactId>app4mc.example.transform.amalthea.m2t</artifactId>
+ <artifactId>app4mc.example.transform.m2t</artifactId>
<packaging>jar</packaging>
<build>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/src/configuration/M2TTransformation.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/configuration/M2TTransformation.java
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/src/configuration/M2TTransformation.java
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/configuration/M2TTransformation.java
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/src/model/loader/AmaltheaMultiFileLoader.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/model/loader/AmaltheaMultiFileLoader.java
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/src/model/loader/AmaltheaMultiFileLoader.java
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/model/loader/AmaltheaMultiFileLoader.java
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/src/module/DefaultM2TInjectorModule.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/module/DefaultM2TInjectorModule.java
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/src/module/DefaultM2TInjectorModule.java
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/module/DefaultM2TInjectorModule.java
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/src/templates/AmaltheaModel2TextTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/AmaltheaModel2TextTransformer.xtend
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/src/templates/AmaltheaModel2TextTransformer.xtend
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/AmaltheaModel2TextTransformer.xtend
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/src/templates/M2T_Output_Transformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/M2T_Output_Transformer.xtend
similarity index 100%
rename from eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.amalthea.m2t/src/templates/M2T_Output_Transformer.xtend
rename to eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/M2T_Output_Transformer.xtend
diff --git a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.core.feature/feature.xml b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.core.feature/feature.xml
index 401869f..1a9253f 100644
--- a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.core.feature/feature.xml
+++ b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.core.feature/feature.xml
@@ -25,12 +25,6 @@
version="0.0.0"/>
<plugin
- id="org.eclipse.app4mc.transformation.application.base"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="org.eclipse.app4mc.transformation.extensions"
download-size="0"
install-size="0"
@@ -44,4 +38,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.app4mc.transformation.application"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.examples.feature/feature.xml b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.examples.feature/feature.xml
index 45e82b2..1ece9b4 100644
--- a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.examples.feature/feature.xml
+++ b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.examples.feature/feature.xml
@@ -21,21 +21,21 @@
</license>
<plugin
- id="app4mc.example.transform.amalthea.application"
+ id="app4mc.example.transform.app"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="app4mc.example.transform.amalthea.m2m"
+ id="app4mc.example.transform.m2m"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="app4mc.example.transform.amalthea.m2t"
+ id="app4mc.example.transform.m2t"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/.classpath b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.classpath
similarity index 100%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/.classpath
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.classpath
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/.gitignore b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.gitignore
similarity index 100%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/.gitignore
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.gitignore
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/.project b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.project
similarity index 92%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/.project
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.project
index 76a5875..3615b5a 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/.project
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.app4mc.transformation.application.base</name>
+ <name>org.eclipse.app4mc.transformation.application</name>
<comment></comment>
<projects>
</projects>
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/.settings/org.eclipse.jdt.core.prefs b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/.settings/org.eclipse.jdt.core.prefs
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.settings/org.eclipse.jdt.core.prefs
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/META-INF/MANIFEST.MF
similarity index 74%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/META-INF/MANIFEST.MF
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/META-INF/MANIFEST.MF
index 9cfa4f2..3ade288 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/META-INF/MANIFEST.MF
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: APP4MC Transformation Base Application
-Bundle-SymbolicName: org.eclipse.app4mc.transformation.application.base;singleton:=true
+Bundle-SymbolicName: org.eclipse.app4mc.transformation.application;singleton:=true
Bundle-Version: 0.3.0.qualifier
Bundle-Vendor: Eclipse APP4MC
-Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
+Require-Bundle: org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,
+ com.google.guava,
+ com.google.inject;bundle-version="3.0.0";visibility:=reexport,
+ org.eclipse.core.runtime;visibility:=reexport,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
- com.google.guava,
org.eclipse.xtext.xbase.lib,
org.eclipse.xtend.lib,
org.eclipse.xtend.lib.macro,
org.eclipse.sphinx.emf.editors.forms,
- com.google.inject;bundle-version="3.0.0";visibility:=reexport,
- org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,
- org.eclipse.app4mc.transformation.extensions;bundle-version="0.3.0"
+ org.eclipse.app4mc.transformation.extensions
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.app4mc.transformation.application.base
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/build.properties b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/build.properties
similarity index 100%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/build.properties
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/build.properties
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/plugin.xml b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/plugin.xml
similarity index 74%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/plugin.xml
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/plugin.xml
index 696f9a1..8f64c68 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/plugin.xml
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/plugin.xml
@@ -8,7 +8,7 @@
<application
visible="true">
<run
- class="org.eclipse.app4mc.transformation.application.Application">
+ class="org.eclipse.app4mc.transformation.application.base.Application">
</run>
</application>
</extension>
@@ -17,11 +17,11 @@
id="product"
point="org.eclipse.core.runtime.products">
<product
- application="app4mc.example.transform.amalthea.application.application"
- name="APP4MCTransformation">
+ application="app4mc.example.transform.app.application"
+ name="APP4MC Example Transformation">
<property
name="appName"
- value="APP4MCTransformation">
+ value="APP4MC Example Transformation">
</property>
</product>
</extension>
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/pom.xml b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/pom.xml
similarity index 88%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/pom.xml
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/pom.xml
index b948cb8..be654e1 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/pom.xml
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/pom.xml
@@ -11,7 +11,7 @@
<version>0.3.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.app4mc.transformation.application.base</artifactId>
+ <artifactId>org.eclipse.app4mc.transformation.application</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/src/org/eclipse/app4mc/transformation/application/base/Application.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/Application.java
similarity index 92%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/src/org/eclipse/app4mc/transformation/application/base/Application.java
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/Application.java
index bab6745..40d9b47 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/src/org/eclipse/app4mc/transformation/application/base/Application.java
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/Application.java
@@ -46,7 +46,7 @@
logger.removeAllAppenders();
} else {
System.out.println(
- "ERROR !! Unable to start model to model transformation as required parameters are not set in input properties file");
+ "ERROR !! Unable to start transformation as required parameters are not set in input properties file");
return new Integer(-1);
}
@@ -58,7 +58,7 @@
String logFilePath = inputParameters.getProperty("log_file");
- org.apache.log4j.Logger logger = LogManager.getLogger("com.bosch.m2m.app4mc.simulation");
+ org.apache.log4j.Logger logger = LogManager.getLogger("org.eclipse.app4mc.transformation");
logger.setLevel(Level.INFO);
try {
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/src/org/eclipse/app4mc/transformation/application/base/ExecuteTransformation.xtend b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/ExecuteTransformation.xtend
similarity index 100%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/src/org/eclipse/app4mc/transformation/application/base/ExecuteTransformation.xtend
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/ExecuteTransformation.xtend
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/src/org/eclipse/app4mc/transformation/application/base/ExtensionExecution.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/ExtensionExecution.java
similarity index 100%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/src/org/eclipse/app4mc/transformation/application/base/ExtensionExecution.java
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/ExtensionExecution.java
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/src/org/eclipse/app4mc/transformation/application/base/TransformationConfig.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/TransformationConfig.java
similarity index 100%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application.base/src/org/eclipse/app4mc/transformation/application/base/TransformationConfig.java
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/TransformationConfig.java
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/META-INF/MANIFEST.MF
index 3822d3c..589a024 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/META-INF/MANIFEST.MF
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@
Bundle-Version: 0.3.0.qualifier
Bundle-Vendor: Eclipse APP4MC
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: com.google.inject;bundle-version="3.0.0";visibility:=reexport,
- org.apache.log4j;bundle-version="1.2.15",
+Require-Bundle: org.apache.log4j;bundle-version="1.2.15",
+ com.google.inject;bundle-version="3.0.0";visibility:=reexport,
org.eclipse.core.runtime,
org.eclipse.emf.ecore,
org.eclipse.emf.ecore.xmi;visibility:=reexport,