Bug 501730 - [Designer] make the branch modular working
Change-Id: I3e88d90302bda54403e8e803ffe22c1713c58dfc
diff --git a/components/org.eclipse.papyrus.designer.components.transformation/src/org/eclipse/papyrus/designer/components/transformation/container/ContainerTrafo.java b/components/org.eclipse.papyrus.designer.components.transformation/src/org/eclipse/papyrus/designer/components/transformation/container/ContainerTrafo.java
new file mode 100644
index 0000000..1c7e472
--- /dev/null
+++ b/components/org.eclipse.papyrus.designer.components.transformation/src/org/eclipse/papyrus/designer/components/transformation/container/ContainerTrafo.java
@@ -0,0 +1,774 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Ansgar Radermacher  ansgar.radermacher@cea.fr
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.designer.components.transformation.container;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.designer.components.FCM.BindTemplate;
+import org.eclipse.papyrus.designer.components.FCM.ContainerRule;
+import org.eclipse.papyrus.designer.components.FCM.ContainerRuleKind;
+import org.eclipse.papyrus.designer.components.FCM.InteractionComponent;
+import org.eclipse.papyrus.designer.components.FCM.InterceptionKind;
+import org.eclipse.papyrus.designer.components.FCM.InterceptionRule;
+import org.eclipse.papyrus.designer.components.FCM.Singleton;
+import org.eclipse.papyrus.designer.components.FCM.util.FCMUtil;
+import org.eclipse.papyrus.designer.components.transformation.Messages;
+import org.eclipse.papyrus.designer.components.transformation.PortUtils;
+import org.eclipse.papyrus.designer.components.transformation.extensions.AbstractContainerTrafo;
+import org.eclipse.papyrus.designer.components.transformation.templates.TemplateUtils;
+import org.eclipse.papyrus.designer.deployment.tools.DepCreation;
+import org.eclipse.papyrus.designer.deployment.tools.DepUtils;
+import org.eclipse.papyrus.designer.transformation.base.utils.CopyUtils;
+import org.eclipse.papyrus.designer.transformation.base.utils.ElementUtils;
+import org.eclipse.papyrus.designer.transformation.base.utils.MapUtil;
+import org.eclipse.papyrus.designer.transformation.base.utils.StUtils;
+import org.eclipse.papyrus.designer.transformation.base.utils.TransformationException;
+import org.eclipse.papyrus.designer.transformation.core.templates.TemplateInstantiation;
+import org.eclipse.papyrus.designer.transformation.core.transformations.LazyCopier;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
+import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
+import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
+import org.eclipse.uml2.uml.Association;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Connector;
+import org.eclipse.uml2.uml.ConnectorEnd;
+import org.eclipse.uml2.uml.EncapsulatedClassifier;
+import org.eclipse.uml2.uml.Feature;
+import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Slot;
+import org.eclipse.uml2.uml.TemplateBinding;
+import org.eclipse.uml2.uml.TemplateParameter;
+import org.eclipse.uml2.uml.TemplateSignature;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.ValueSpecification;
+import org.eclipse.uml2.uml.VisibilityKind;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+/**
+ * Make the container transformation, i.e. add elements into a container
+ *
+ */
+public class ContainerTrafo extends AbstractContainerTrafo {
+
+	public static final String executorPartName = "_executor"; //$NON-NLS-1$
+
+	public static final String interceptorName = "intercept "; //$NON-NLS-1$
+
+	public static final String containerPostfix = "_cc"; //$NON-NLS-1$
+
+	public static final String hwContainerPostfix = "_hwcc"; //$NON-NLS-1$
+
+	/**
+	 * Constructor
+	 *
+	 * @param copier
+	 *            copier from source to target model
+	 * @param tmCDP
+	 *            deployment plan within target model
+	 */
+	public ContainerTrafo(LazyCopier copier, Package tmCDP, InstanceSpecification executorIS) {
+		this.copier = copier;
+		this.tmCDP = tmCDP;
+		this.executorIS = executorIS;
+		portInfo = new HashMap<Property, Port>();
+	}
+
+	/**
+	 * creates the executor. Needs to be called *before* the other operations of
+	 * this class.
+	 *
+	 * @param tmComponent
+	 *            the implementation of a component
+	 *
+	 * @throws TransformationException
+	 */
+	@Override
+	public void createContainer(Class smComponent, Class tmComponent) throws TransformationException {
+		Package tmPkgOwner;
+		if (tmComponent.eResource() == tmCDP.eResource()) {
+			// tmComponent is in same model as tmContainer
+			tmPkgOwner = tmComponent.getNearestPackage();
+		}
+		else {
+			// tmComponent is not a member of the target model. This is the case, if tmComponent is
+			// in an imported model that has not been copied during the transformation towards an intermediate
+			// model.
+			tmPkgOwner = MapUtil.getAndCreate(PackageUtil.getRootPackage(tmCDP), tmComponent.allNamespaces(), true);
+		}
+		// create a container with the suitable postfix
+		tmContainerImpl = tmPkgOwner.createOwnedClass(tmComponent.getName() + containerPostfix, false);
+
+		// Apply singleton to container, if original class is a singleton
+		boolean isSingleton = StereotypeUtil.isApplied(smComponent, Singleton.class);
+		if (isSingleton) {
+			StereotypeUtil.apply(tmContainerImpl, Singleton.class);
+		}
+		CopyUtils.copyID(tmComponent, tmContainerImpl, containerPostfix);
+
+		// add part and slot corresponding to component;
+		executorPart = tmContainerImpl.createOwnedAttribute(executorPartName, tmComponent);
+		CopyUtils.copyID(tmComponent, executorPart, "e"); //$NON-NLS-1$
+
+		executorPart.setIsComposite(true);
+
+		// copy ports from the executor (tmComponent) to the container
+		// (tmContainerImpl)
+		// TODO: connectors still point to the ports of the executor, implying a non-well-formed
+		// model. Yet code generation works, as port names are identical
+		for (Port port : PortUtils.getAllPorts(tmComponent)) {
+			// copy port
+			if (port.getVisibility() == VisibilityKind.PUBLIC_LITERAL) {
+				Port newPort = EcoreUtil.copy(port); // don't use copier, since this is not a copier from source to target model
+				tmContainerImpl.getOwnedAttributes().add(newPort);
+				StUtils.copyStereotypes(port, newPort);
+
+				// create delegation for application port
+				Connector containerDelegation = tmContainerImpl.createOwnedConnector("delegation " + port.getName()); //$NON-NLS-1$
+				CopyUtils.copyID(tmContainerImpl, containerDelegation);
+				ConnectorEnd end1 = containerDelegation.createEnd();
+				end1.setRole(newPort);
+				ConnectorEnd end2 = containerDelegation.createEnd();
+				end2.setPartWithPort(executorPart);
+				end2.setRole(port);
+			}
+		}
+
+		// Inheritance issues:
+		// currently: container never copies inheritance relationships, but copies inherited ports into container
+		// Problem: polymorphism would stop working.
+		// Objective: use inheritance, if possible, but avoid that container inherits from an original non-abstract class (avoid duplication of attributes, ...)
+		// Option: container inherits from fully abstract super-classes (might have to consider indirect super-classes).
+		// All connectors and container extension remain within container (i.e. no inheritance of connectors and container extensions)
+		// Remaining problems: Imagine that component A inherits from component B and both have state-charts.
+		// => containers of A and B would define a state-Machine and an event pool.
+		// => No shared pool (but anyway: semantics of this construct is not very clear).
+		containers.put(tmComponent, this);
+	}
+
+	/**
+	 * Create a container for a HW class. This is an additional software class
+	 * within the system. There is no executor part, i.e. executorPart remains
+	 *
+	 * @param tmComponent
+	 *            the implementation of a component
+	 *
+	 * @throws TransformationException
+	 */
+	public void createHwContainer(Class tmComponent) throws TransformationException {
+		Package tmPkgOwner = (Package) tmComponent.getOwner();
+		tmContainerImpl = tmPkgOwner.createOwnedClass(tmComponent.getName() + hwContainerPostfix, false);
+		CopyUtils.copyID(tmComponent, tmContainerImpl, hwContainerPostfix);
+
+		// register created container
+		containers.put(tmComponent, this);
+	}
+
+	/**
+	 * Create an instance of the container (UML instance specification)
+	 *
+	 * @param tmComponent
+	 *            the component within the target model for which we want to create an instance
+	 *
+	 * @param tmIS
+	 *            the existing instance specification for the component before container expansion. This
+	 *            instance specification becomes the new instance specification of the executor.
+	 * @param context
+	 *            Additional information about the container that is used by instance configurators
+	 */
+	@Override
+	public InstanceSpecification createContainerInstance(Class tmComponent, InstanceSpecification tmIS) throws TransformationException {
+		// create an instance specification for the container
+		InstanceSpecification containerIS =
+				(InstanceSpecification) tmCDP.createPackagedElement(tmIS.getName(), UMLPackage.eINSTANCE.getInstanceSpecification());
+		// assign new name to original instance specification which reflects
+		// role within containment hierarchy
+		tmIS.setName(tmIS.getName() + "." + executorPartName); //$NON-NLS-1$
+		containerIS.getClassifiers().add(tmContainerImpl);
+		// existing instance specification (tmIS) is the executor instance specification
+		DepCreation.createSlot(containerIS, tmIS, executorPart);
+		counter = 0;
+		// containers.put(tmComponent, this);
+		EList<Slot> connectorSlots = new BasicEList<Slot>();
+
+		executorIS = tmIS;
+		// now create instances for the contained elements
+		for (Property extensionPart : tmContainerImpl.getAttributes()) {
+			Type tmContainerExtImpl = extensionPart.getType();
+			if (tmContainerExtImpl instanceof Class) {
+				if (DepUtils.getSlot(containerIS, extensionPart) == null) {
+					// no slot for part exists => assume that the part has been added by the container and create an instance specification for it.
+					InstanceSpecification containerExtIS = null;
+
+					String isName = containerIS.getName() + "." + extensionPart.getName(); //$NON-NLS-1$
+
+					// create sub-instance and slot for extensions
+					if (containerExtIS == null) {
+						containerExtIS = DepCreation.createDepPlan(tmCDP, (Class) tmContainerExtImpl, isName, false);
+					}
+					Slot partSlot = DepCreation.createSlot(containerIS, containerExtIS, extensionPart);
+					if (StereotypeUtil.isApplied(tmContainerExtImpl, InteractionComponent.class)) {
+						connectorSlots.add(partSlot);
+					}
+				}
+			}
+		}
+
+		// handle propagation of node allocation for connectors. Do that in 2nd loop, since the allocation
+		// of parts might be incomplete before.
+		// TODO: is in library now
+		//for (Slot connectorSlot : connectorSlots) {
+		//	ConnectorReification.propagateNodeAllocation(tmContainerImpl, containerIS, connectorSlot);
+		// }
+		moveSlots(executorIS);
+		return containerIS;
+	}
+
+	/**
+	 * Create an instance of the container (UML instance specification)
+	 *
+	 * @param tmComponent
+	 * @param tmIS
+	 */
+	public InstanceSpecification createHwContainerInstance(Class tmComponent, InstanceSpecification tmNode) {
+		// create an instance specification for the container
+		InstanceSpecification containerIS =
+				(InstanceSpecification) tmCDP.createPackagedElement(tmNode.getName() + hwContainerPostfix, UMLPackage.eINSTANCE.getInstanceSpecification());
+		// assign new name to original instance specification which reflects
+		// role within containment hierarchy
+		containerIS.getClassifiers().add(tmContainerImpl);
+		// containers.put(tmComponent, this);
+		counter = 0;
+		executorIS = tmNode;
+		// copy slots from HW instance specification
+		for (Slot slot : tmNode.getSlots()) {
+			Slot slotCopy = containerIS.createSlot();
+			slotCopy.setDefiningFeature(slot.getDefiningFeature());
+			// copy values (use CopyTo.copyTo(slot, containerIS) instead?)
+			for (ValueSpecification value : slot.getValues()) {
+				CopyUtils.copyValue(value, slotCopy);
+			}
+		}
+		return containerIS;
+	}
+
+	/**
+	 * return the reference of the created container class
+	 *
+	 * @return
+	 */
+	public Class getContainer() {
+		return tmContainerImpl;
+	}
+
+	/**
+	 * apply a container rule, i.e. add either a container extension or an
+	 * interceptor to the container
+	 *
+	 * @param smContainerRule
+	 *            An container rule
+	 * @param smComponent
+	 *            the application component in the source model
+	 * @param tmComponent
+	 *            the application component in the target model
+	 * @param tmIS
+	 *            the instance specification for the application component in the target model
+	 * @throws TransformationException
+	 */
+	@Override
+	public void applyRule(ContainerRule smContainerRule, Class smComponent, Class tmComponent)
+			throws TransformationException
+	{
+		Map<Property, EList<Property>> interceptorPartsMap = new HashMap<Property, EList<Property>>();
+
+		for (Property part : smContainerRule.getBase_Class().getAllAttributes()) {
+			Type type = part.getType();
+			if (type == null) {
+				String ruleName = (smContainerRule.getBase_Class() != null) ? smContainerRule.getBase_Class().getName() : "undefined"; //$NON-NLS-1$
+				throw new TransformationException(String.format(
+						Messages.ContainerTrafo_CannotApplyRule, ruleName));
+			}
+			if (part instanceof Port) {
+				Port newPort = tmContainerImpl.createOwnedPort(part.getName(), part.getType());
+				StUtils.copyStereotypes(part, newPort);
+			}
+			else if (type instanceof Class) {
+				Class extOrInterceptor = (Class) type;
+				// DepUtils.chooseImplementation((Class) type,
+				// new BasicEList<InstanceSpecification>(), false);
+
+				if (StereotypeUtil.isApplied(part, InterceptionRule.class)) {
+					if (StereotypeUtil.isApplied(extOrInterceptor, InteractionComponent.class)) {
+
+						InterceptionRule interceptionRule = UMLUtil.getStereotypeApplication(part, InterceptionRule.class);
+						InterceptionKind interceptionKind = interceptionRule.getInterceptionKind();
+						EList<Feature> interceptFeatures = interceptionRule.getInterceptionSet();
+						EList<Property> interceptorParts =
+								expandInterceptorExtension(interceptionKind, interceptFeatures, extOrInterceptor, tmComponent);
+						interceptorPartsMap.put(part, interceptorParts);
+					}
+					else {
+						throw new TransformationException(String.format(
+								Messages.ContainerTrafo_InterceptionRuleButNoInterceptor,
+								part.getName(), smContainerRule.getBase_Class().getName()));
+					}
+				}
+				else {
+					Property extensionPart =
+							expandAggregationExtension(part, extOrInterceptor, tmComponent);
+					// register relation to facilitate connector copy
+					copier.setPackageTemplate(smContainerRule.getBase_Class(), tmContainerImpl);
+					copier.putPair(part, extensionPart);
+					copier.setPackageTemplate(null, null);
+				}
+			}
+		}
+		createConnectorForAssociations();
+
+		// tell copier that tmcontainerImpl is associated with the smContainerRule
+		// register a package template (although it is not a template) to assure that the connectors
+		// get copied, although they are in a different resource (only the connectors are copied, not
+		// the types of the referenced parts).
+		// [main issue here: properties of container rule are not copies in the sense of identical
+		// copies]
+		copier.setPackageTemplate(smContainerRule.getBase_Class(), tmContainerImpl);
+
+		for (Connector connector : smContainerRule.getBase_Class().getOwnedConnectors()) {
+			Property ruleInterceptorPart = null;
+			for (Property part : interceptorPartsMap.keySet()) {
+				if (ConnectorUtil.connectsPart(connector, part)) {
+					// this connector is a connection between an interceptor (and another part which may not
+					// be an interceptor => TODO: validation rule yet to write
+					// we need to copy this connector multiple times, once for each associated interceptor part
+					ruleInterceptorPart = part;
+					break;
+				}
+			}
+			if (ruleInterceptorPart != null) {
+				for (Property interceptorPart : interceptorPartsMap.get(ruleInterceptorPart)) {
+					// map an interceptor part within rule successively to to an interceptor part
+					// within the container
+					copier.putPair(ruleInterceptorPart, interceptorPart);
+					copier.getCopy(connector);
+				}
+			}
+			else {
+				// check whether FCM connector
+				org.eclipse.papyrus.designer.components.FCM.Connector fcmConn =
+						UMLUtil.getStereotypeApplication(connector, org.eclipse.papyrus.designer.components.FCM.Connector.class);
+				if (fcmConn != null) {
+					//
+					// TODO: is in library now
+					// ConnectorReification.reifyConnector(copier, tmContainerImpl,
+					//		ElementUtils.varName(connector), connector, executorIS);
+				}
+				else {
+					copier.remove(connector);
+					copier.getCopy(connector);
+				}
+			}
+		}
+		copier.setPackageTemplate(null, null);
+
+		TemplateUtils.retargetConnectors(tmContainerImpl);
+	}
+
+	/**
+	 * This container expansion does not create a new composite. Instead, it
+	 * adds the extension as a part to the copied application component. The
+	 * application component also inherits from the type of the container
+	 * extension in order to avoid copying ports.
+	 */
+	Property expandAggregationExtension(Property smExtensionPart, Class smContainerExtImpl, Class tmComponent) throws TransformationException {
+		Property extensionPart;
+		String name = smExtensionPart.getName();
+		Class tmContainerExtImpl = null;
+
+		TemplateSignature signature = TemplateUtils.getSignature(smContainerExtImpl);
+		if (signature == null) {
+			// no template signature, just copy the container extension into the target model
+			tmContainerExtImpl = copier.getCopy(smContainerExtImpl);
+		}
+		else {
+			// template signature found, instantiate container extension via template binding mechanism
+			Classifier actual;
+			if (StereotypeUtil.isApplied(smExtensionPart, BindTemplate.class)) {
+				BindTemplate bt = UMLUtil.getStereotypeApplication(smExtensionPart, BindTemplate.class);
+				// use explicit binding from stereotype
+				actual = (Classifier) bt.getActual().get(0);
+			}
+			else {
+				// use executor component as actual
+				actual = tmComponent;
+			}
+			// template signature and instantiate container extension via the
+			// template binding mechanism, use executor component as actual
+			TemplateBinding binding = TemplateUtils.fixedBinding(copier.target, smContainerExtImpl, actual);
+			TemplateInstantiation ti = new TemplateInstantiation(copier, binding);
+			tmContainerExtImpl = ti.bindElement(smContainerExtImpl);
+		}
+
+		// --------------------------------------------------
+		// a container extension could be subject to container rules as well, i.e. need
+		// to handle recursive rule application.
+		EList<ContainerRule> rules = FCMUtil.getAllContainerRules(smContainerExtImpl);
+
+		// get container trafo instance, if already existing
+		AbstractContainerTrafo containerTrafo = AbstractContainerTrafo.get(tmContainerExtImpl);
+
+		if (containerTrafo == null) {
+			// no container exists, check rules and create eventually
+			for (ContainerRule rule : rules) {
+				// at least one active rule => create container (or get previously instantiated))
+				if (containerTrafo == null) {
+					if (rule.getKind() == ContainerRuleKind.LIGHT_WEIGHT_OO_RULE) {
+						throw new TransformationException(Messages.ContainerTrafo_RecursiveLWnotSupported);
+					}
+					else {
+						containerTrafo = new ContainerTrafo(copier, tmCDP, null);
+					}
+					containerTrafo.createContainer(smContainerExtImpl, tmContainerExtImpl);
+				}
+				else {
+					// configure only??
+				}
+				containerTrafo.applyRule(rule, smContainerExtImpl, tmContainerExtImpl);
+			}
+			if (containerTrafo != null) {
+				containerTrafo.finalize();
+				tmContainerExtImpl = ((ContainerTrafo) containerTrafo).getContainer();
+			}
+		}
+		// --------------------------------------------------
+
+		// add part associated with the extension to the container
+		extensionPart = tmContainerImpl.createOwnedAttribute(name, tmContainerExtImpl);
+
+		// Copy.copyID(tmComponent, extensionPart, "a");
+		extensionPart.setAggregation(smExtensionPart.getAggregation());
+		CopyUtils.copyMultElemModifiers(smExtensionPart, extensionPart);
+		CopyUtils.copyFeatureModifiers(smExtensionPart, extensionPart);
+
+		return extensionPart;
+	}
+
+	/**
+	 * Expand an interceptor definition between the container and the executor.
+	 *
+	 * @param extKind
+	 *            the interception kind (intercept which ports: all, some, out, ...)
+	 * @param featureList
+	 *            The set of ports to intercept (In case of "some" above)
+	 * @param smContainerConnImpl
+	 *            The connector (interceptor) implementation in the source model
+	 * @param tmComponent
+	 *            the application component (executor) in the target model
+	 * @return
+	 * @throws TransformationException
+	 */
+	EList<Property> expandInterceptorExtension(InterceptionKind extKind, EList<Feature> featureList, Class smContainerConnImpl, Class tmComponent)
+			throws TransformationException
+	{
+		EList<Property> connectorParts = new BasicEList<Property>();
+		// replace delegation connectors with extension connector
+		for (Port port : PortUtils.getAllPorts(tmComponent)) {
+			// delegate to component via connector
+			boolean match = true;
+			if (extKind == InterceptionKind.INTERCEPT_ALL_IN) {
+				// IN-PORT = provided port
+				match = (PortUtils.getProvided(port) != null);
+			}
+			else if (extKind == InterceptionKind.INTERCEPT_ALL_OUT) {
+				// IN-PORT = provided port
+				match = (PortUtils.getRequired(port) != null);
+			}
+			else if (extKind == InterceptionKind.INTERCEPT_SOME) {
+				// comparison based on name, since in different models
+				match = (ElementUtils.getNamedElementFromList(featureList, port.getName()) != null);
+			}
+			else if (extKind == InterceptionKind.INTERCEPT_MATCHING) {
+				EList<Port> interceptorPorts = PortUtils.getAllPorts(smContainerConnImpl);
+				match = false;
+				// get first port from interception connector that is typed with a template parameter
+				for (Port interceptorPort : interceptorPorts) {
+					if (interceptorPort.getType().getOwner() instanceof TemplateParameter) {
+						match = (PortUtils.getKind(port) == PortUtils.getKind(interceptorPort));
+						break;
+					}
+				}
+			}
+
+			// else INTERCEPT_ALL_PORT => match remains true
+			if (!match) {
+				// port does not match criterion, continue with next port
+				continue;
+			}
+
+			Property connectorPart;
+			String interceptionName = interceptorName + port.getName() + counter;
+			Connector interceptionConnector = null;
+			// get delegation connector
+			for (Connector connector : tmContainerImpl.getOwnedConnectors()) {
+				if (ConnectorUtil.connectsPort(connector, port)) {
+					interceptionConnector = connector;
+					break;
+				}
+			}
+			// interceptionConnector = tmContainerImpl.getOwnedConnector
+			// ("delegation " + port.getName ());
+			if (interceptionConnector == null) {
+				throw new TransformationException(Messages.ContainerTrafo_CannotFindDelegationConn);
+			}
+
+			interceptionConnector.setName(interceptionName);
+			org.eclipse.papyrus.designer.components.FCM.Connector fcmConn = StereotypeUtil.applyApp(interceptionConnector, org.eclipse.papyrus.designer.components.FCM.Connector.class);
+			InteractionComponent fcmConnType = UMLUtil.getStereotypeApplication(smContainerConnImpl, InteractionComponent.class);
+			fcmConn.setIc(fcmConnType);
+
+			// pass target component and port to interceptor (not clean, define
+			// suitable template signature as for instance in methodCall_comp
+			ContainerTrafo.instance = executorIS;
+			ContainerTrafo.port = port;
+			// TODO: is in library now
+			// connectorPart = ConnectorReification.reifyConnector(copier, tmContainerImpl, ElementUtils.varName(interceptionConnector), interceptionConnector, executorIS);
+			connectorPart = null;
+			connectorParts.add(connectorPart);
+			ContainerTrafo.port = null;
+			portInfo.put(connectorPart, port);
+			// delete intermediate connector (has been replaced by two
+			// connections to the reified connector)
+			interceptionConnector.destroy();
+		}
+		counter++;
+		return connectorParts;
+	}
+
+	/**
+	 * Move a slot from the executor instance specification to an instance
+	 * specification of an extension/interceptor. This is required, since
+	 * users cannot configure containers directly. The modification is done in
+	 * the target model, i.e. the user model is not affected.
+	 *
+	 * Configuration is based on the idea that we can have multiple classifiers for an
+	 * instance specification and that we add additional slots for attributes of the 2nd
+	 * classifier which becomes "visible" after container transformation.
+	 * Main use: configure priority of thread within container.
+	 *
+	 * TODO: Not clear, whether we should keep this operation, since configuration of elements that are not
+	 * (directly) part of the user model is confusing. Application was: configuration
+	 * of thread priorities within container.
+	 */
+	public void moveSlots(InstanceSpecification containerIS) {
+		// Log.log(Status.INFO, Log.TRAFO_CONTAINER, String.format(Messages.ContainerTrafo_InfoMoveSlots, executorIS.getQualifiedName()));
+		Classifier mainCl = DepUtils.getClassifier(executorIS);
+		Iterator<Slot> slotIt = executorIS.getSlots().iterator();
+		while (slotIt.hasNext()) {
+			Slot slot = slotIt.next();
+			String featureName = slot.getDefiningFeature().getName();
+			if (!mainCl.getAllAttributes().contains(slot.getDefiningFeature())) {
+				// defining feature does not belong to main classifier
+				// => move it to first matching instance specification
+				for (InstanceSpecification is : DepUtils.getContainedInstances(containerIS)) {
+					Classifier containedCl = DepUtils.getClassifier(is);
+					if (ElementUtils.getNamedElementFromList(containedCl.getAllAttributes(), featureName) != null) {
+						if (executorIS != is) {
+							// remove slot first from iterator, as addition below removes it from the list (slots are owned)
+							slotIt.remove();
+							is.getSlots().add(slot);
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Create an connector for parts that have an association. The rationale
+	 * behind this is support connections between the state machine in the container
+	 * and the executor.
+	 *
+	 */
+	public void createConnectorForAssociations() {
+		// TODO: keep list of added parts, only re-check those!
+
+		for (Property part : ElementUtils.getParts(tmContainerImpl)) {
+			if (part.getType() == null) {
+				continue;
+			}
+			for (Association association : part.getType().getAssociations()) {
+				// Part has an association. Check if the other association end
+				// targets one of
+				// other parts within the container
+				for (Property end : association.getMemberEnds()) {
+					Type type = end.getType();
+					if ((type != null) && (type != part.getType())) {
+						// end is not typed with the part we are currently
+						// examining
+						// thus, it might belong to another part of the
+						// composite
+						for (Property checkPart : ElementUtils.getParts(tmContainerImpl)) {
+							if (type == checkPart.getType()) {
+								// found an association between two parts of the
+								// container => create connection,
+								// unless already existing.
+								if (!ConnectorUtil.existsConnector(tmContainerImpl, part, checkPart)) {
+									Connector conn = tmContainerImpl.createOwnedConnector(part.getName() + "_" + checkPart.getName()); //$NON-NLS-1$
+									conn.setType(association);
+									conn.createEnd().setRole(part);
+									conn.createEnd().setRole(checkPart);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public void finalize() {
+		discoverServices();
+	}
+
+	/**
+	 * Connector ports of executor with compatible ports offered by container extensions
+	 * (runtime system)
+	 */
+	public void discoverServices() {
+		Type executorType = executorPart.getType();
+		if (!(executorType instanceof EncapsulatedClassifier)) {
+			return;
+		}
+		EncapsulatedClassifier ec = (EncapsulatedClassifier) executorType;
+		for (Port executorPort : ec.getOwnedPorts()) {
+			for (Property svcPart : tmContainerImpl.getOwnedAttributes()) {
+				if (svcPart == executorPart) {
+					continue;
+				}
+				Type containerSvcType = svcPart.getType();
+				if (containerSvcType instanceof EncapsulatedClassifier) {
+					EncapsulatedClassifier containerSvc = (EncapsulatedClassifier) containerSvcType;
+					for (Port svcPort : containerSvc.getOwnedPorts()) {
+						if (PortUtils.matches(executorPort, svcPort, true)) {
+							// create connector
+							Connector c = tmContainerImpl.createOwnedConnector(
+									String.format("auto from %s to %s", executorPart.getName(), svcPart.getName())); //$NON-NLS-1$
+							ConnectorEnd ce1 = c.createEnd();
+							ConnectorEnd ce2 = c.createEnd();
+							ce1.setPartWithPort(executorPart);
+							ce1.setRole(executorPort);
+							ce2.setPartWithPort(svcPart);
+							ce2.setRole(svcPort);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Return the containerTrafo associated with a container. This operation is useful for instance
+	 * configurators that need more information about the container context, in particular to associate
+	 * a part with a port that is intercepted.
+	 *
+	 * @param containerInstance
+	 *            the container instance (the parent instance of an instance of a container extension)ight be a container instance)
+	 * @return the containerTrafo info, if found.
+	 */
+	public static ContainerTrafo getContainerTrafo(InstanceSpecification containerInstance) {
+		Classifier containerCandidate = DepUtils.getClassifier(containerInstance);
+		Property executorPart = containerCandidate.getAttribute(executorPartName, null);
+		if ((executorPart != null) && executorPart.getType() instanceof Class) {
+			AbstractContainerTrafo containerTrafo = AbstractContainerTrafo.get((Class) executorPart.getType());
+			if (containerTrafo instanceof ContainerTrafo) {
+				return (ContainerTrafo) containerTrafo;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Utility function to retrieve the executor slot, when given the container instance.
+	 * Needs to be called, after a container instance has been created.
+	 *
+	 * @param containerInstance
+	 *            the instance of a container specification
+	 * @return the associated executor slot, or null, if it cannot be found
+	 */
+	public static Slot getExecutorSlot(InstanceSpecification containerInstance) {
+		for (Slot slot : containerInstance.getSlots()) {
+			if (slot.getDefiningFeature().getName().equals(ContainerTrafo.executorPartName)) {
+				return slot;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Return the port that is intercepted when given a part
+	 *
+	 * @param containerPart
+	 *            a part that participates in a port interception
+	 * @return intercepted port
+	 */
+	public Port getInterceptedPort(Property containerPart) {
+		return portInfo.get(containerPart);
+	}
+
+	/**
+	 * The attribute within the container that holds the executor, i.e. the
+	 * original component
+	 */
+	protected Property executorPart;
+
+	/**
+	 * An instance specification of the executor in the target model (todo: should be source model instead?), i.e.
+	 * of the component before container expansion
+	 */
+	protected InstanceSpecification executorIS;
+
+	/**
+	 * The created container implementation (prefixed with tm, since part of
+	 * target model)
+	 */
+	protected Class tmContainerImpl;
+
+	/**
+	 * A counter which is used to manage unique names for interceptors (if
+	 * multiple interceptors are applied)
+	 */
+	protected int counter;
+
+	/**
+	 * Store information about intercepted port. The map contains a mapping from the part representing
+	 * a reified connector to the port that was intercepted. It is stored, since it might be used by instance
+	 * configurators that configure the container instance.
+	 */
+	protected Map<Property, Port> portInfo;
+	
+	public static InstanceSpecification instance;
+	
+	public static Port port;
+}
diff --git a/components/org.eclipse.papyrus.designer.components.validation/META-INF/MANIFEST.MF b/components/org.eclipse.papyrus.designer.components.validation/META-INF/MANIFEST.MF
index 902d80f..b89c19b 100644
--- a/components/org.eclipse.papyrus.designer.components.validation/META-INF/MANIFEST.MF
+++ b/components/org.eclipse.papyrus.designer.components.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.uml2.uml;bundle-version="3.0.1",
  org.eclipse.emf.validation;bundle-version="1.3.0",
- org.eclipse.papyrus.designer.components.transformation.core;bundle-version="0.7.4",
+ org.eclipse.papyrus.designer.transformation.core;bundle-version="0.7.5",
  org.eclipse.papyrus.designer.components.fcm.profile;bundle-version="0.7.4",
  org.eclipse.ui,
  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0"
diff --git a/components/pom.xml b/components/pom.xml
index 52a410d..6a5b384 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -21,7 +21,7 @@
 		<module>org.eclipse.papyrus.designer.components.transformation.java</module>
 		<module>org.eclipse.papyrus.designer.components.transformation.ui</module>
 		<module>org.eclipse.papyrus.designer.components.validation</module>
-		<!-- module>org.eclipse.papyrus.designer.components.modellibs.core</module-->
+		<module>org.eclipse.papyrus.designer.components.modellibs.core</module>
 		<!-- module>tracing</module-->
 	</modules>
 
diff --git a/releng/org.eclipse.papyrus.designer.components.main.feature/feature.xml b/releng/org.eclipse.papyrus.designer.components.main.feature/feature.xml
index cb3296e..b4d9828 100644
--- a/releng/org.eclipse.papyrus.designer.components.main.feature/feature.xml
+++ b/releng/org.eclipse.papyrus.designer.components.main.feature/feature.xml
@@ -42,7 +42,7 @@
    </requires>
 
    <plugin
-         id="org.eclipse.papyrus.designer.components.transformation.core"
+         id="org.eclipse.papyrus.designer.transformation.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -70,20 +70,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.papyrus.designer.components.modellibs.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.designer.components.vsl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.papyrus.designer.components.fcm.profile"
          download-size="0"
          install-size="0"
@@ -104,4 +90,25 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.papyrus.designer.components.modellibs.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.components.transformation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.components.transformation.java"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/releng/org.eclipse.papyrus.designer.components.tracing.feature/feature.xml b/releng/org.eclipse.papyrus.designer.components.tracing.feature/feature.xml
index 95c7048..1c1b199 100644
--- a/releng/org.eclipse.papyrus.designer.components.tracing.feature/feature.xml
+++ b/releng/org.eclipse.papyrus.designer.components.tracing.feature/feature.xml
@@ -23,25 +23,5 @@
       %license
    </license>
 
-   <plugin
-         id="org.eclipse.papyrus.designer.components.modellibs.tracing"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.infra.services.tracepoints"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.views.tracepoints"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
 </feature>
diff --git a/releng/org.eclipse.papyrus.designer.transformation.main.feature/.project b/releng/org.eclipse.papyrus.designer.transformation.main.feature/.project
new file mode 100644
index 0000000..1099ae7
--- /dev/null
+++ b/releng/org.eclipse.papyrus.designer.transformation.main.feature/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.designer.transformation.main.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.papyrus.designer.transformation.main.feature/.settings/org.eclipse.core.resources.prefs b/releng/org.eclipse.papyrus.designer.transformation.main.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/releng/org.eclipse.papyrus.designer.transformation.main.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/releng/org.eclipse.papyrus.designer.transformation.main.feature/.settings/org.eclipse.m2e.core.prefs b/releng/org.eclipse.papyrus.designer.transformation.main.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/releng/org.eclipse.papyrus.designer.transformation.main.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/releng/org.eclipse.papyrus.designer.transformation.main.feature/build.properties b/releng/org.eclipse.papyrus.designer.transformation.main.feature/build.properties
new file mode 100644
index 0000000..f0ce0ce
--- /dev/null
+++ b/releng/org.eclipse.papyrus.designer.transformation.main.feature/build.properties
@@ -0,0 +1,6 @@
+bin.includes = feature.xml,\
+               epl-v10.html,\
+               feature.properties,\
+               license.html
+src.includes = epl-v10.html,\
+               license.html
diff --git a/releng/org.eclipse.papyrus.designer.transformation.main.feature/epl-v10.html b/releng/org.eclipse.papyrus.designer.transformation.main.feature/epl-v10.html
new file mode 100644
index 0000000..cb1073a
--- /dev/null
+++ b/releng/org.eclipse.papyrus.designer.transformation.main.feature/epl-v10.html
@@ -0,0 +1,304 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	
+	}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang="EN-US" style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.papyrus.designer.transformation.main.feature/feature.properties b/releng/org.eclipse.papyrus.designer.transformation.main.feature/feature.properties
new file mode 100644
index 0000000..0448d45
--- /dev/null
+++ b/releng/org.eclipse.papyrus.designer.transformation.main.feature/feature.properties
@@ -0,0 +1,143 @@
+###############################################################################
+# Copyright (c) 2013 CEA LIST.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     CEA LIST - initial API and implementation
+###############################################################################
+featureName=Papyrus Qompass designer, develop and deploy component based applications (Incubation)
+providerName=Eclipse Modeling Project
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 9, 2014\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+\t- Content may be structured and packaged into modules to facilitate delivering,\n\
+\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+\t  plug-in fragments ("Fragments"), and features ("Features").\n\
+\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+\t  in a directory named "plugins".\n\
+\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
+\t  named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+\t- The top-level (root) directory\n\
+\t- Plug-in and Fragment directories\n\
+\t- Inside Plug-ins and Fragments packaged as JARs\n\
+\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
+\t- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\t   extending or updating the functionality of an Eclipse-based product.\n\
+\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
+\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
+\t   of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/releng/org.eclipse.papyrus.designer.transformation.main.feature/feature.xml b/releng/org.eclipse.papyrus.designer.transformation.main.feature/feature.xml
new file mode 100644
index 0000000..d01eebf
--- /dev/null
+++ b/releng/org.eclipse.papyrus.designer.transformation.main.feature/feature.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.designer.transformation.main.feature"
+      label="%featureName"
+      version="0.7.5.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      A transformation based design methodology, part of Papyrus software designer (from which
+      it inherits support for generating code for several programming languages). It is based on
+- A M2M transformation profile
+- A deployment profile
+- A generic M2M transformation infrastructure providing for instance a generic lazy model copying mechanism. 
+- A library of pre-defined M2M transformations (e.g. adding an additional class aka boot-loader that instantiates the system)
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2016 CEA LIST
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.papyrus.designer.languages.common.feature"/>
+      <import feature="org.eclipse.papyrus.designer.languages.cpp.feature"/>
+      <import feature="org.eclipse.papyrus.designer.languages.java.feature"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.transformation.base"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.transformation.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.transformation.extensions"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.transformation.languages.cpp.library"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.transformation.languages.java.library"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.transformation.library"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.transformation.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.transformation.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.transformation.vsl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.deployment.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.designer.deployment.tools"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/releng/org.eclipse.papyrus.designer.transformation.main.feature/license.html b/releng/org.eclipse.papyrus.designer.transformation.main.feature/license.html
new file mode 100644
index 0000000..c3d34c3
--- /dev/null
+++ b/releng/org.eclipse.papyrus.designer.transformation.main.feature/license.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/releng/org.eclipse.papyrus.designer.transformation.main.feature/pom.xml b/releng/org.eclipse.papyrus.designer.transformation.main.feature/pom.xml
new file mode 100644
index 0000000..607215f
--- /dev/null
+++ b/releng/org.eclipse.papyrus.designer.transformation.main.feature/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus.designer</groupId>
+		<artifactId>org.eclipse.papyrus.designer.releng</artifactId>
+		<version>1.0.4-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.designer.transformation.main.feature</artifactId>
+	<version>0.7.5-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/pom.xml b/releng/pom.xml
index 219e070..e7839b9 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -20,6 +20,9 @@
 		<!-- idl -->
 		<module>org.eclipse.papyrus.designer.languages.idl.feature</module>
 
+		<!-- m2m transformations and deployment -->
+		<module>org.eclipse.papyrus.designer.transformation.main.feature</module>
+
 		<!-- components -->
 		<module>org.eclipse.papyrus.designer.components.main.feature</module>
 		<module>org.eclipse.papyrus.designer.components.tracing.feature</module>
diff --git a/transformation/languages/cpp/org.eclipse.papyrus.designer.transformation.languages.cpp.library/.classpath b/transformation/languages/cpp/org.eclipse.papyrus.designer.transformation.languages.cpp.library/.classpath
index cf36b56..873bf67 100644
--- a/transformation/languages/cpp/org.eclipse.papyrus.designer.transformation.languages.cpp.library/.classpath
+++ b/transformation/languages/cpp/org.eclipse.papyrus.designer.transformation.languages.cpp.library/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/transformation/languages/java/org.eclipse.papyrus.designer.transformation.languages.java.library/.classpath b/transformation/languages/java/org.eclipse.papyrus.designer.transformation.languages.java.library/.classpath
index cf36b56..873bf67 100644
--- a/transformation/languages/java/org.eclipse.papyrus.designer.transformation.languages.java.library/.classpath
+++ b/transformation/languages/java/org.eclipse.papyrus.designer.transformation.languages.java.library/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/transformation/org.eclipse.papyrus.designer.transformation.base/src/org/eclipse/papyrus/designer/transformation/base/utils/ElementUtils.java b/transformation/org.eclipse.papyrus.designer.transformation.base/src/org/eclipse/papyrus/designer/transformation/base/utils/ElementUtils.java
index 78fc0fe..2bb6b9b 100644
--- a/transformation/org.eclipse.papyrus.designer.transformation.base/src/org/eclipse/papyrus/designer/transformation/base/utils/ElementUtils.java
+++ b/transformation/org.eclipse.papyrus.designer.transformation.base/src/org/eclipse/papyrus/designer/transformation/base/utils/ElementUtils.java
@@ -161,7 +161,8 @@
 	public static NamedElement getQualifiedElementFromRS(ResourceSet rs, String qualifiedName) {
 		for (Resource resource : rs.getResources()) {
 			if (resource instanceof UMLResource) {
-				for (EObject topLevelElem : resource.getContents()) {
+				if (resource.getContents().size() > 0) {
+					EObject topLevelElem = resource.getContents().get(0);
 					if (topLevelElem instanceof Package) {
 						NamedElement ne = getQualifiedElement((Package) topLevelElem, qualifiedName);
 						if (ne != null) {