Renamed transformation templates package
diff --git a/framework/examples/app4mc.example.transform.m2m/META-INF/MANIFEST.MF b/framework/examples/app4mc.example.transform.m2m/META-INF/MANIFEST.MF
index 0955958..e57b3ba 100644
--- a/framework/examples/app4mc.example.transform.m2m/META-INF/MANIFEST.MF
+++ b/framework/examples/app4mc.example.transform.m2m/META-INF/MANIFEST.MF
@@ -11,9 +11,9 @@
Automatic-Module-Name: app4mc.example.transform.m2m
Import-Package: javax.inject;version="1.0.0",
org.eclipse.app4mc.transformation,
- org.eclipse.app4mc.transformation.starter,
org.eclipse.app4mc.transformation.executiontype,
- org.eclipse.app4mc.transformation.templates,
+ org.eclipse.app4mc.transformation.starter,
+ org.eclipse.app4mc.transformation.transformers,
org.osgi.service.component;version="1.4.0",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j;version="1.7.2"
diff --git a/framework/examples/app4mc.example.transform.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend b/framework/examples/app4mc.example.transform.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend
index b027672..c2eb2e0 100644
--- a/framework/examples/app4mc.example.transform.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend
+++ b/framework/examples/app4mc.example.transform.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend
@@ -17,7 +17,7 @@
import org.eclipse.app4mc.amalthea.model.Amalthea
import org.eclipse.app4mc.amalthea.model.HWModel
import org.eclipse.app4mc.transformation.ServiceConstants
-import org.eclipse.app4mc.transformation.templates.Model2ModelRootTransformer
+import org.eclipse.app4mc.transformation.transformers.Model2ModelRootTransformer
import org.eclipse.emf.common.util.URI
import org.eclipse.emf.ecore.resource.ResourceSet
import org.osgi.service.component.annotations.Activate
diff --git a/framework/examples/app4mc.example.transform.m2m/src/templates/CacheTransformer.xtend b/framework/examples/app4mc.example.transform.m2m/src/templates/CacheTransformer.xtend
index e9f2736..24efea8 100644
--- a/framework/examples/app4mc.example.transform.m2m/src/templates/CacheTransformer.xtend
+++ b/framework/examples/app4mc.example.transform.m2m/src/templates/CacheTransformer.xtend
@@ -14,7 +14,7 @@
import app4mc.example.transform.samplemodel.SampleModelFactory
import org.eclipse.app4mc.amalthea.model.Cache
import org.eclipse.app4mc.transformation.ServiceConstants
-import org.eclipse.app4mc.transformation.templates.AbstractTransformer
+import org.eclipse.app4mc.transformation.transformers.AbstractTransformer
import org.osgi.service.component.annotations.Activate
import org.osgi.service.component.annotations.Component
import org.osgi.service.component.annotations.ConfigurationPolicy
diff --git a/framework/examples/app4mc.example.transform.m2m/src/templates/HWTransformer.xtend b/framework/examples/app4mc.example.transform.m2m/src/templates/HWTransformer.xtend
index b703fc0..03b7749 100644
--- a/framework/examples/app4mc.example.transform.m2m/src/templates/HWTransformer.xtend
+++ b/framework/examples/app4mc.example.transform.m2m/src/templates/HWTransformer.xtend
@@ -18,7 +18,7 @@
import org.eclipse.app4mc.amalthea.model.ProcessingUnit
import org.eclipse.app4mc.amalthea.model.StructureType
import org.eclipse.app4mc.transformation.ServiceConstants
-import org.eclipse.app4mc.transformation.templates.AbstractTransformer
+import org.eclipse.app4mc.transformation.transformers.AbstractTransformer
import org.osgi.service.component.annotations.Activate
import org.osgi.service.component.annotations.Component
import org.osgi.service.component.annotations.ConfigurationPolicy
diff --git a/framework/examples/app4mc.example.transform.m2m/src/templates/MemoryTransformer.xtend b/framework/examples/app4mc.example.transform.m2m/src/templates/MemoryTransformer.xtend
index 4690e0b..f510c12 100644
--- a/framework/examples/app4mc.example.transform.m2m/src/templates/MemoryTransformer.xtend
+++ b/framework/examples/app4mc.example.transform.m2m/src/templates/MemoryTransformer.xtend
@@ -14,7 +14,7 @@
import app4mc.example.transform.samplemodel.SampleModelFactory
import org.eclipse.app4mc.amalthea.model.Memory
import org.eclipse.app4mc.transformation.ServiceConstants
-import org.eclipse.app4mc.transformation.templates.AbstractTransformer
+import org.eclipse.app4mc.transformation.transformers.AbstractTransformer
import org.osgi.service.component.annotations.Activate
import org.osgi.service.component.annotations.Component
import org.osgi.service.component.annotations.ConfigurationPolicy
diff --git a/framework/examples/app4mc.example.transform.m2m/src/templates/ProcessingUnitTransformer.xtend b/framework/examples/app4mc.example.transform.m2m/src/templates/ProcessingUnitTransformer.xtend
index 0d05bfe..b702b4c 100644
--- a/framework/examples/app4mc.example.transform.m2m/src/templates/ProcessingUnitTransformer.xtend
+++ b/framework/examples/app4mc.example.transform.m2m/src/templates/ProcessingUnitTransformer.xtend
@@ -15,7 +15,7 @@
import org.eclipse.app4mc.amalthea.model.Cache
import org.eclipse.app4mc.amalthea.model.ProcessingUnit
import org.eclipse.app4mc.transformation.ServiceConstants
-import org.eclipse.app4mc.transformation.templates.AbstractTransformer
+import org.eclipse.app4mc.transformation.transformers.AbstractTransformer
import org.osgi.service.component.annotations.Activate
import org.osgi.service.component.annotations.Component
import org.osgi.service.component.annotations.ConfigurationPolicy
diff --git a/framework/examples/app4mc.example.transform.m2t.cust/META-INF/MANIFEST.MF b/framework/examples/app4mc.example.transform.m2t.cust/META-INF/MANIFEST.MF
index 9f37f29..563ba6c 100644
--- a/framework/examples/app4mc.example.transform.m2t.cust/META-INF/MANIFEST.MF
+++ b/framework/examples/app4mc.example.transform.m2t.cust/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.app4mc.amalthea.model;bundle-version="0.9.9"
Import-Package: org.eclipse.app4mc.transformation,
- org.eclipse.app4mc.transformation.starter,
org.eclipse.app4mc.transformation.executiontype,
- org.eclipse.app4mc.transformation.templates,
+ org.eclipse.app4mc.transformation.starter,
+ org.eclipse.app4mc.transformation.transformers,
org.osgi.service.component.annotations;version="1.3.0";resolution:=optional,
org.slf4j;version="1.7.2",
templates
diff --git a/framework/examples/app4mc.example.transform.m2t/META-INF/MANIFEST.MF b/framework/examples/app4mc.example.transform.m2t/META-INF/MANIFEST.MF
index 2443e2d..04fa47d 100644
--- a/framework/examples/app4mc.example.transform.m2t/META-INF/MANIFEST.MF
+++ b/framework/examples/app4mc.example.transform.m2t/META-INF/MANIFEST.MF
@@ -14,9 +14,9 @@
OSGI-INF/configuration.M2TTransformationDefinition.xml
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.app4mc.transformation,
- org.eclipse.app4mc.transformation.starter,
org.eclipse.app4mc.transformation.executiontype,
- org.eclipse.app4mc.transformation.templates,
+ org.eclipse.app4mc.transformation.starter,
+ org.eclipse.app4mc.transformation.transformers,
org.osgi.service.component;version="1.4.0",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j;version="1.7.2"
diff --git a/framework/examples/app4mc.example.transform.m2t/src/templates/AmaltheaModel2TextTransformer.xtend b/framework/examples/app4mc.example.transform.m2t/src/templates/AmaltheaModel2TextTransformer.xtend
index 24ebc1e..dd23629 100644
--- a/framework/examples/app4mc.example.transform.m2t/src/templates/AmaltheaModel2TextTransformer.xtend
+++ b/framework/examples/app4mc.example.transform.m2t/src/templates/AmaltheaModel2TextTransformer.xtend
@@ -17,7 +17,7 @@
import java.util.Map
import org.eclipse.app4mc.amalthea.model.Amalthea
import org.eclipse.app4mc.transformation.ServiceConstants
-import org.eclipse.app4mc.transformation.templates.Model2TextRootTransformer
+import org.eclipse.app4mc.transformation.transformers.Model2TextRootTransformer
import org.eclipse.emf.ecore.resource.ResourceSet
import org.osgi.service.component.annotations.Activate
import org.osgi.service.component.annotations.Component
diff --git a/framework/examples/app4mc.example.transform.m2t/src/templates/M2T_Output_Transformer.xtend b/framework/examples/app4mc.example.transform.m2t/src/templates/M2T_Output_Transformer.xtend
index 2bfaf82..14f4df5 100644
--- a/framework/examples/app4mc.example.transform.m2t/src/templates/M2T_Output_Transformer.xtend
+++ b/framework/examples/app4mc.example.transform.m2t/src/templates/M2T_Output_Transformer.xtend
@@ -16,7 +16,7 @@
import org.eclipse.app4mc.amalthea.model.Task
import org.eclipse.app4mc.amalthea.model.util.ModelUtil
import org.eclipse.app4mc.amalthea.model.util.SoftwareUtil
-import org.eclipse.app4mc.transformation.templates.AbstractTransformer
+import org.eclipse.app4mc.transformation.transformers.AbstractTransformer
import org.osgi.service.component.annotations.Component
@Component(service=M2T_Output_Transformer)
diff --git a/framework/examples/app4mc.example.transform.ui/META-INF/MANIFEST.MF b/framework/examples/app4mc.example.transform.ui/META-INF/MANIFEST.MF
index 2c266ff..82d3976 100644
--- a/framework/examples/app4mc.example.transform.ui/META-INF/MANIFEST.MF
+++ b/framework/examples/app4mc.example.transform.ui/META-INF/MANIFEST.MF
@@ -14,9 +14,9 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.inject;version="1.0.0",
org.eclipse.app4mc.transformation,
- org.eclipse.app4mc.transformation.starter,
org.eclipse.app4mc.transformation.executiontype,
- org.eclipse.app4mc.transformation.templates,
+ org.eclipse.app4mc.transformation.starter,
+ org.eclipse.app4mc.transformation.transformers,
org.eclipse.e4.core.contexts;version="1.7.0",
org.eclipse.e4.core.di.annotations;version="1.6.0",
org.eclipse.e4.core.di.extensions;version="0.15.0",
diff --git a/framework/plugins/org.eclipse.app4mc.transformation/META-INF/MANIFEST.MF b/framework/plugins/org.eclipse.app4mc.transformation/META-INF/MANIFEST.MF
index 9e10a2c..6fcf6a9 100644
--- a/framework/plugins/org.eclipse.app4mc.transformation/META-INF/MANIFEST.MF
+++ b/framework/plugins/org.eclipse.app4mc.transformation/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
org.eclipse.emf;bundle-version="2.6.0";visibility:=reexport
Export-Package: org.eclipse.app4mc.transformation;version="0.1.0",
org.eclipse.app4mc.transformation.executiontype;version="0.1.0",
- org.eclipse.app4mc.transformation.templates;version="0.1.0",
+ org.eclipse.app4mc.transformation.transformers;version="0.1.0",
org.eclipse.app4mc.transformation.util;version="0.1.0"
Automatic-Module-Name: org.eclipse.app4mc.transformation
Import-Package: org.osgi.service.cm;version="1.6.0",
diff --git a/framework/plugins/org.eclipse.app4mc.transformation/OSGI-INF/org.eclipse.app4mc.transformation.registry.TransformerRegistry.xml b/framework/plugins/org.eclipse.app4mc.transformation/OSGI-INF/org.eclipse.app4mc.transformation.registry.TransformerRegistry.xml
index c0f7a80..02a6d75 100644
--- a/framework/plugins/org.eclipse.app4mc.transformation/OSGI-INF/org.eclipse.app4mc.transformation.registry.TransformerRegistry.xml
+++ b/framework/plugins/org.eclipse.app4mc.transformation/OSGI-INF/org.eclipse.app4mc.transformation.registry.TransformerRegistry.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" activate="activate" configuration-pid="TRANSFORMATION_SESSION_CONFIG" configuration-policy="require" deactivate="deactivate" name="org.eclipse.app4mc.transformation.registry.TransformerRegistry">
<reference bind="setM2mConfig" cardinality="0..n" interface="org.eclipse.app4mc.transformation.executiontype.IModelToModelConfig" name="M2mConfig" policy="dynamic" unbind="unsetM2mConfig"/>
- <reference bind="setM2mTransformer" cardinality="0..n" interface="org.eclipse.app4mc.transformation.templates.Model2ModelRootTransformer" name="M2mTransformer" policy="dynamic" unbind="unsetM2mTransformer"/>
+ <reference bind="setM2mTransformer" cardinality="0..n" interface="org.eclipse.app4mc.transformation.transformers.Model2ModelRootTransformer" name="M2mTransformer" policy="dynamic" unbind="unsetM2mTransformer"/>
<reference bind="setM2tConfig" cardinality="0..n" interface="org.eclipse.app4mc.transformation.executiontype.IModelToTextConfig" name="M2tConfig" policy="dynamic" unbind="unsetM2tConfig"/>
- <reference bind="setM2tTransformer" cardinality="0..n" interface="org.eclipse.app4mc.transformation.templates.Model2TextRootTransformer" name="M2tTransformer" policy="dynamic" unbind="unsetM2tTransformer"/>
+ <reference bind="setM2tTransformer" cardinality="0..n" interface="org.eclipse.app4mc.transformation.transformers.Model2TextRootTransformer" name="M2tTransformer" policy="dynamic" unbind="unsetM2tTransformer"/>
<reference cardinality="1..1" field="configAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" name="configAdmin"/>
<implementation class="org.eclipse.app4mc.transformation.registry.TransformerRegistry"/>
</scr:component>
\ No newline at end of file
diff --git a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/registry/TransformerRegistry.java b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/registry/TransformerRegistry.java
index ecf921d..e8c16cb 100644
--- a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/registry/TransformerRegistry.java
+++ b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/registry/TransformerRegistry.java
@@ -28,10 +28,10 @@
import java.util.stream.Collectors;
import org.eclipse.app4mc.transformation.ServiceConstants;
-import org.eclipse.app4mc.transformation.templates.Model2ModelRootTransformer;
-import org.eclipse.app4mc.transformation.templates.Model2TextRootTransformer;
import org.eclipse.app4mc.transformation.executiontype.IModelToModelConfig;
import org.eclipse.app4mc.transformation.executiontype.IModelToTextConfig;
+import org.eclipse.app4mc.transformation.transformers.Model2ModelRootTransformer;
+import org.eclipse.app4mc.transformation.transformers.Model2TextRootTransformer;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.component.annotations.Activate;
diff --git a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/AbstractTransformer.java b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/AbstractTransformer.java
similarity index 92%
rename from framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/AbstractTransformer.java
rename to framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/AbstractTransformer.java
index 6b180b9..02461a8 100644
--- a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/AbstractTransformer.java
+++ b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/AbstractTransformer.java
@@ -11,7 +11,7 @@
* Robert Bosch GmbH - initial API and implementation
*/
-package org.eclipse.app4mc.transformation.templates;
+package org.eclipse.app4mc.transformation.transformers;
import java.util.Map;
diff --git a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/IRootTransformer.java b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/IRootTransformer.java
similarity index 90%
rename from framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/IRootTransformer.java
rename to framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/IRootTransformer.java
index f35fa31..c5eb3b7 100644
--- a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/IRootTransformer.java
+++ b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/IRootTransformer.java
@@ -12,7 +12,7 @@
* Robert Bosch GmbH - initial API and implementation
*******************************************************************************/
-package org.eclipse.app4mc.transformation.templates;
+package org.eclipse.app4mc.transformation.transformers;
public interface IRootTransformer {
diff --git a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/ISubTransformer.java b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/ISubTransformer.java
similarity index 90%
rename from framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/ISubTransformer.java
rename to framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/ISubTransformer.java
index f808530..bb463c8 100644
--- a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/ISubTransformer.java
+++ b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/ISubTransformer.java
@@ -12,7 +12,7 @@
* Robert Bosch GmbH - initial API and implementation
*******************************************************************************/
-package org.eclipse.app4mc.transformation.templates;
+package org.eclipse.app4mc.transformation.transformers;
public interface ISubTransformer {
diff --git a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/Model2ModelRootTransformer.java b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/Model2ModelRootTransformer.java
similarity index 91%
rename from framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/Model2ModelRootTransformer.java
rename to framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/Model2ModelRootTransformer.java
index 051dc2d..dbafe21 100644
--- a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/Model2ModelRootTransformer.java
+++ b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/Model2ModelRootTransformer.java
@@ -11,7 +11,7 @@
* Robert Bosch GmbH - initial API and implementation
*/
-package org.eclipse.app4mc.transformation.templates;
+package org.eclipse.app4mc.transformation.transformers;
import org.eclipse.emf.ecore.resource.ResourceSet;
diff --git a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/Model2TextRootTransformer.java b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/Model2TextRootTransformer.java
similarity index 91%
rename from framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/Model2TextRootTransformer.java
rename to framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/Model2TextRootTransformer.java
index 974131a..d242473 100644
--- a/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/templates/Model2TextRootTransformer.java
+++ b/framework/plugins/org.eclipse.app4mc.transformation/src/org/eclipse/app4mc/transformation/transformers/Model2TextRootTransformer.java
@@ -11,7 +11,7 @@
* Robert Bosch GmbH - initial API and implementation
*/
-package org.eclipse.app4mc.transformation.templates;
+package org.eclipse.app4mc.transformation.transformers;
import org.eclipse.emf.ecore.resource.ResourceSet;
diff --git a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/META-INF/MANIFEST.MF b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/META-INF/MANIFEST.MF
index 21dbc8c..f708719 100644
--- a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/META-INF/MANIFEST.MF
+++ b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/META-INF/MANIFEST.MF
@@ -17,6 +17,6 @@
org.eclipse.app4mc.slg.config.util,
org.eclipse.app4mc.transformation;version="0.1.0",
org.eclipse.app4mc.transformation.executiontype;version="0.1.0",
- org.eclipse.app4mc.transformation.templates;version="0.1.0",
+ org.eclipse.app4mc.transformation.transformers;version="0.1.0",
org.eclipse.app4mc.transformation.util;version="0.1.0",
org.slf4j;version="1.7.2"
diff --git a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/LabelAccessTransformer.xtend b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/LabelAccessTransformer.xtend
index 0ebc5cb..3d70bf5 100644
--- a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/LabelAccessTransformer.xtend
+++ b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/LabelAccessTransformer.xtend
@@ -19,7 +19,7 @@
import com.google.inject.Singleton
import org.eclipse.app4mc.amalthea.model.LabelAccess
import org.eclipse.app4mc.slg.commons.m2t.generators.LabelAccessTranslationUnit
-import org.eclipse.app4mc.transformation.templates.AbstractTransformer
+import org.eclipse.app4mc.transformation.transformers.AbstractTransformer
import org.eclipse.app4mc.transformation.util.OutputBuffer
@Singleton
diff --git a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/TicksTransformer.xtend b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/TicksTransformer.xtend
index ba103cc..9570de5 100644
--- a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/TicksTransformer.xtend
+++ b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/TicksTransformer.xtend
@@ -21,7 +21,7 @@
import java.util.List
import org.eclipse.app4mc.amalthea.model.Ticks
import org.eclipse.app4mc.slg.commons.m2t.generators.TicksTranslationUnit
-import org.eclipse.app4mc.transformation.templates.AbstractTransformer
+import org.eclipse.app4mc.transformation.transformers.AbstractTransformer
import org.eclipse.app4mc.transformation.util.OutputBuffer
@Singleton
diff --git a/load_generator/commons/plugins/org.eclipse.app4mc.slg.config/META-INF/MANIFEST.MF b/load_generator/commons/plugins/org.eclipse.app4mc.slg.config/META-INF/MANIFEST.MF
index 9ef160d..fae7fff 100644
--- a/load_generator/commons/plugins/org.eclipse.app4mc.slg.config/META-INF/MANIFEST.MF
+++ b/load_generator/commons/plugins/org.eclipse.app4mc.slg.config/META-INF/MANIFEST.MF
@@ -18,5 +18,5 @@
Import-Package: javax.inject;version="1.0.0",
org.eclipse.app4mc.transformation;version="0.1.0",
org.eclipse.app4mc.transformation.executiontype;version="0.1.0",
- org.eclipse.app4mc.transformation.templates;version="0.1.0",
+ org.eclipse.app4mc.transformation.transformers;version="0.1.0",
org.slf4j;version="1.7.2"
diff --git a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/META-INF/MANIFEST.MF b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/META-INF/MANIFEST.MF
index 7938606..fe6f2e9 100644
--- a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/META-INF/MANIFEST.MF
+++ b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
Import-Package: javax.inject;version="1.0.0",
org.eclipse.app4mc.transformation;version="0.1.0",
org.eclipse.app4mc.transformation.executiontype;version="0.1.0",
- org.eclipse.app4mc.transformation.templates;version="0.1.0",
+ org.eclipse.app4mc.transformation.transformers;version="0.1.0",
org.eclipse.app4mc.transformation.util;version="0.1.0",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j;version="1.7.2"
diff --git a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/artefacts/LinuxRootTransformer.java b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/artefacts/LinuxRootTransformer.java
index 90e2eef..e518500 100644
--- a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/artefacts/LinuxRootTransformer.java
+++ b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/artefacts/LinuxRootTransformer.java
@@ -21,7 +21,7 @@
import org.eclipse.app4mc.slg.linux.transformers.LinuxModel2TextTransformer;
import org.eclipse.app4mc.transformation.ServiceConstants;
-import org.eclipse.app4mc.transformation.templates.Model2TextRootTransformer;
+import org.eclipse.app4mc.transformation.transformers.Model2TextRootTransformer;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/LinuxBaseTransformer.java b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/LinuxBaseTransformer.java
index c04d65d..6aab57c 100644
--- a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/LinuxBaseTransformer.java
+++ b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/LinuxBaseTransformer.java
@@ -15,7 +15,7 @@
package org.eclipse.app4mc.slg.linux.transformers;
-import org.eclipse.app4mc.transformation.templates.ISubTransformer;
+import org.eclipse.app4mc.transformation.transformers.ISubTransformer;
import org.eclipse.app4mc.transformation.util.OutputBuffer;
import com.google.inject.Inject;
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/META-INF/MANIFEST.MF b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/META-INF/MANIFEST.MF
index a659fcb..a5c952f 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/META-INF/MANIFEST.MF
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
Import-Package: javax.inject;version="1.0.0",
org.eclipse.app4mc.transformation,
org.eclipse.app4mc.transformation.executiontype,
- org.eclipse.app4mc.transformation.templates,
+ org.eclipse.app4mc.transformation.transformers,
org.eclipse.app4mc.transformation.util,
org.osgi.service.component;version="1.4.0",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/OSGI-INF/org.eclipse.app4mc.slg.ros2.artefacts.ROS2RootTransformer.xml b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/OSGI-INF/org.eclipse.app4mc.slg.ros2.artefacts.ROS2RootTransformer.xml
index e6eacbb..860aa0b 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/OSGI-INF/org.eclipse.app4mc.slg.ros2.artefacts.ROS2RootTransformer.xml
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/OSGI-INF/org.eclipse.app4mc.slg.ros2.artefacts.ROS2RootTransformer.xml
@@ -2,7 +2,7 @@
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" activate="activate" configuration-pid="TRANSFORMATION_SESSION_CONFIG" configuration-policy="require" name="org.eclipse.app4mc.slg.ros2.artefacts.ROS2RootTransformer">
<property name="transformation" value="ROS2_SLG"/>
<service>
- <provide interface="org.eclipse.app4mc.transformation.templates.Model2TextRootTransformer"/>
+ <provide interface="org.eclipse.app4mc.transformation.transformers.Model2TextRootTransformer"/>
</service>
<reference cardinality="1..1" field="moduleFactory" interface="org.eclipse.app4mc.slg.ros2.artefacts.ROS2GoogleGuiceModuleFactory" name="moduleFactory"/>
<implementation class="org.eclipse.app4mc.slg.ros2.artefacts.ROS2RootTransformer"/>
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/artefacts/ROS2RootTransformer.java b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/artefacts/ROS2RootTransformer.java
index 1e8bf8f..faed087 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/artefacts/ROS2RootTransformer.java
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/artefacts/ROS2RootTransformer.java
@@ -19,7 +19,7 @@
import org.eclipse.app4mc.slg.ros2.transformers.RosModel2TextTransformer;
import org.eclipse.app4mc.transformation.ServiceConstants;
-import org.eclipse.app4mc.transformation.templates.Model2TextRootTransformer;
+import org.eclipse.app4mc.transformation.transformers.Model2TextRootTransformer;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosChannelSendTransformer.xtend b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosChannelSendTransformer.xtend
index 9d9e964..f1ba4e9 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosChannelSendTransformer.xtend
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosChannelSendTransformer.xtend
@@ -17,7 +17,7 @@
import com.google.inject.Singleton
import org.eclipse.app4mc.amalthea.model.ChannelSend
import org.eclipse.app4mc.slg.ros2.generators.RosChannelSendTranslationUnit
-import org.eclipse.app4mc.transformation.templates.AbstractTransformer
+import org.eclipse.app4mc.transformation.transformers.AbstractTransformer
import org.eclipse.app4mc.transformation.util.OutputBuffer
@Singleton
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosInterProcessTriggerTransformer.xtend b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosInterProcessTriggerTransformer.xtend
index 7432b8f..78dc099 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosInterProcessTriggerTransformer.xtend
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosInterProcessTriggerTransformer.xtend
@@ -17,7 +17,7 @@
import com.google.inject.Singleton
import org.eclipse.app4mc.amalthea.model.InterProcessTrigger
import org.eclipse.app4mc.slg.ros2.generators.RosInterProcessTriggerTranslationUnit
-import org.eclipse.app4mc.transformation.templates.AbstractTransformer
+import org.eclipse.app4mc.transformation.transformers.AbstractTransformer
import org.eclipse.app4mc.transformation.util.OutputBuffer
@Singleton
diff --git a/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t.cust/META-INF/MANIFEST.MF b/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t.cust/META-INF/MANIFEST.MF
index 3dd6374..781c4f8 100644
--- a/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t.cust/META-INF/MANIFEST.MF
+++ b/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t.cust/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.inject;version="1.0.0",
org.eclipse.app4mc.transformation,
- org.eclipse.app4mc.transformation.starter,
org.eclipse.app4mc.transformation.executiontype,
- org.eclipse.app4mc.transformation.templates,
+ org.eclipse.app4mc.transformation.starter,
+ org.eclipse.app4mc.transformation.transformers,
org.osgi.service.component;version="1.4.0",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
org.slf4j;version="1.7.2"
diff --git a/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/META-INF/MANIFEST.MF b/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/META-INF/MANIFEST.MF
index 4a3ca65..a2ba53e 100644
--- a/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/META-INF/MANIFEST.MF
+++ b/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
Import-Package: javax.inject;version="1.0.0",
org.eclipse.app4mc.transformation,
org.eclipse.app4mc.transformation.executiontype,
- org.eclipse.app4mc.transformation.templates,
+ org.eclipse.app4mc.transformation.transformers,
org.eclipse.app4mc.transformation.util,
org.osgi.service.component;version="1.4.0",
org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
diff --git a/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/OSGI-INF/org.eclipse.app4mc.amlt2systemc.m2t.SystemCRootTransformer.xml b/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/OSGI-INF/org.eclipse.app4mc.amlt2systemc.m2t.SystemCRootTransformer.xml
index 9d83837..2637009 100644
--- a/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/OSGI-INF/org.eclipse.app4mc.amlt2systemc.m2t.SystemCRootTransformer.xml
+++ b/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/OSGI-INF/org.eclipse.app4mc.amlt2systemc.m2t.SystemCRootTransformer.xml
@@ -2,7 +2,7 @@
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" activate="activate" configuration-pid="TRANSFORMATION_SESSION_CONFIG" configuration-policy="require" name="org.eclipse.app4mc.amlt2systemc.m2t.SystemCRootTransformer">
<property name="transformation" value="APP4MCSIM"/>
<service>
- <provide interface="org.eclipse.app4mc.transformation.templates.Model2TextRootTransformer"/>
+ <provide interface="org.eclipse.app4mc.transformation.transformers.Model2TextRootTransformer"/>
</service>
<reference cardinality="1..1" field="factory" interface="org.eclipse.app4mc.amlt2systemc.m2t.SystemCGuiceModuleFactory" name="factory"/>
<implementation class="org.eclipse.app4mc.amlt2systemc.m2t.SystemCRootTransformer"/>
diff --git a/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/src/org/eclipse/app4mc/amlt2systemc/m2t/SystemCRootTransformer.java b/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/src/org/eclipse/app4mc/amlt2systemc/m2t/SystemCRootTransformer.java
index cbedeb4..1492d3b 100644
--- a/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/src/org/eclipse/app4mc/amlt2systemc/m2t/SystemCRootTransformer.java
+++ b/simulation_generator/app4mc.sim/plugins/org.eclipse.app4mc.amlt2systemc.m2t/src/org/eclipse/app4mc/amlt2systemc/m2t/SystemCRootTransformer.java
@@ -22,7 +22,7 @@
import org.eclipse.app4mc.amlt2systemc.m2t.module.PropertyKeys;
import org.eclipse.app4mc.amlt2systemc.m2t.transformers.AmaltheaModel2TextTransformer;
import org.eclipse.app4mc.transformation.ServiceConstants;
-import org.eclipse.app4mc.transformation.templates.Model2TextRootTransformer;
+import org.eclipse.app4mc.transformation.transformers.Model2TextRootTransformer;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
