Bug 484701 - [QDesigner] Refactoring - code generators, architecture exploration and component based design should be organised in common directory

Bug 478797 - [model library] Decide which model library to use for C++ primitive types
Change-Id: Idade4edfcf803da3528c0873aa04b754915866fd

1665 files changed, 4146 insertions, 6142 deletions

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF
deleted file mode 100644
index 97575a4f3e5..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.acceleo.engine;bundle-version="3.2.2",

- org.eclipse.papyrus.fcm.profile;bundle-version="1.2.0",

- org.eclipse.papyrus.acceleo;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.acceleo.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.acceleo.debug.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.acceleo.debug;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/plugin.xml b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/plugin.xml
deleted file mode 100644
index a20a00b609c..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/plugin.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-    <extension
-         point="org.eclipse.ui.commands">
-      <command
-            categoryId="org.eclipse.papyrus.editor.category"
-            defaultHandler="org.eclipse.papyrus.acceleo.debug.handlers.TestAcceleoHandler"
-            description="Test Acceleo Template"
-            id="org.eclipse.papyrus.acceleo.debug.menuActions.TestAcceleoCmd"
-            name="dummy">
-      </command>
-      <command
-            categoryId="org.eclipse.papyrus.editor.category"
-            defaultHandler="org.eclipse.papyrus.acceleo.debug.handlers.ResetAcceleoHandler"
-            description="Reset Acceleo driver"
-            id="org.eclipse.papyrus.acceleo.debug.menuActions.ResetAcceleoCmd"
-            name="dummy">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popup.codegen">
-         <command
-               commandId="org.eclipse.papyrus.acceleo.debug.menuActions.TestAcceleoCmd"
-               icon="icons/allocation.gif"
-               label="Test Acceleo template"
-               mnemonic="T"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.papyrus.acceleo.debug.menuActions.ResetAcceleoCmd"
-               icon="icons/allocation.gif"
-               label="Reset Acceleo driver"
-               mnemonic="R"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-            </visibleWhen>
-         </command>
-	  </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu.codegen">
-         <command
-               commandId="org.eclipse.papyrus.acceleo.debug.menuActions.TestAcceleoCmd"
-               icon="icons/allocation.gif"
-               id="org.eclipse.papyrus.acceleo.debug.menuActions.TestAcceleoMenu"
-               label="Qompass: Test Acceleo template"
-               mnemonic="T"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.papyrus.acceleo.debug.menuActions.ResetAcceleoCmd"
-               icon="icons/allocation.gif"
-               id="org.eclipse.papyrus.acceleo.debug.menuActions.ResetAcceleoMenu"
-               label="Reset Acceleo driver"
-               mnemonic="R"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-            </visibleWhen>
-         </command>
-      </menuContribution>
-	</extension>
-</plugin>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/dialogs/TestAcceleoDialog.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/dialogs/TestAcceleoDialog.java
deleted file mode 100644
index 22609454ace..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/dialogs/TestAcceleoDialog.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.eclipse.papyrus.acceleo.debug.dialogs;
-
-import org.eclipse.papyrus.acceleo.AcceleoDriver;
-import org.eclipse.papyrus.acceleo.AcceleoException;
-import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * Select container rules, either from a list of globally defined rules or from
- * local rules which may be created "on the fly" by this dialog.
- *
- * TODO: extend rule application to instances (problematic, since rules
- * transformation is done on type level)
- *
- * @author ansgar
- */
-public class TestAcceleoDialog extends SelectionStatusDialog {
-
-	protected NamedElement m_acceleoParam;
-
-	protected Text fTemplate;
-
-	protected Button fApplyAcceleoButton;
-
-	protected Text fOutput;
-
-	protected Text fErr;
-
-	protected static String saveTemplate = "";
-
-	public TestAcceleoDialog(Shell parent, NamedElement acceleoParam) {
-		super(parent);
-		m_acceleoParam = acceleoParam;
-	}
-
-	/**
-	 * @see SelectionStatusDialog#computeResult()
-	 */
-	@Override
-	protected void computeResult() {
-		// nothing to do
-		saveTemplate = fTemplate.getText();
-	}
-
-	@Override
-	public Control createDialogArea(Composite parent) {
-		Composite contents = (Composite) super.createDialogArea(parent);
-		// (parent, "Container rules", "Avail. extensions/interceptors");
-
-		createTextAcceleoGroup(contents);
-		return contents;
-	}
-
-	// create instance configuration group
-	protected void createTextAcceleoGroup(Composite parent) {
-		GridData groupGridData = DialogUtils.createFillGridData();
-
-		Group instanceConfigurationGroup = new Group(parent, SWT.BORDER);
-		instanceConfigurationGroup.setText(" Test Acceleo Template");
-		instanceConfigurationGroup.setLayout(new RowLayout(SWT.VERTICAL));
-		instanceConfigurationGroup.setLayout(new GridLayout(1, false));
-		instanceConfigurationGroup.setLayoutData(groupGridData);
-
-		GridData span2 = new GridData();
-		span2.horizontalAlignment = GridData.FILL;
-		span2.verticalAlignment = GridData.FILL;
-		span2.grabExcessHorizontalSpace = true;
-		span2.grabExcessVerticalSpace = true;
-		span2.widthHint = 400;
-		span2.heightHint = 150;
-
-		Label descriptionLabel = new Label(instanceConfigurationGroup, SWT.NONE);
-		descriptionLabel.setText("Template:");
-
-		fTemplate = new Text(instanceConfigurationGroup, SWT.WRAP
-				| SWT.V_SCROLL);
-		fTemplate.setLayoutData(span2);
-		fTemplate.setText(saveTemplate);
-
-		fApplyAcceleoButton = new Button(instanceConfigurationGroup, SWT.NONE);
-		fApplyAcceleoButton.setText("instantiate template");
-		fApplyAcceleoButton.addKeyListener(new KeyListener() {
-
-			@Override
-			public void keyReleased(KeyEvent e) {
-			}
-
-			@Override
-			public void keyPressed(KeyEvent e) {
-				System.out.println(e);
-			}
-		});
-		// fApplyAcceleoButton.setLayoutData(span2);
-		fApplyAcceleoButton.addSelectionListener(new SelectionListener() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				try {
-					AcceleoDriver.clearErrors();
-					String result = AcceleoDriver.bind(fTemplate.getText(), m_acceleoParam);
-					fOutput.setText(result);
-					fErr.setText("");
-				}
-				catch (AcceleoException err) {
-					fOutput.setText("");
-					fErr.setText(err.toString());
-				}
-			}
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		Button fResetButton = new Button(instanceConfigurationGroup, SWT.NONE);
-		fResetButton.setText("reset acceleo driver (reread initial scripts)");
-		fResetButton.addSelectionListener(new SelectionListener() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				fOutput.setText("");
-				fErr.setText("");
-				AcceleoDriver.init();
-			}
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		Label resultLabel = new Label(instanceConfigurationGroup, SWT.NONE);
-		resultLabel.setText("Result:");
-
-		fOutput = new Text(instanceConfigurationGroup, SWT.WRAP
-				| SWT.V_SCROLL | SWT.READ_ONLY);
-		fOutput.setLayoutData(span2);
-
-		Label errLabel = new Label(instanceConfigurationGroup, SWT.NONE);
-		errLabel.setText("Error:");
-
-		GridData span3 = new GridData();
-		span3.horizontalAlignment = GridData.FILL;
-		span3.verticalAlignment = GridData.FILL;
-		span3.grabExcessHorizontalSpace = true;
-		// span3.grabExcessVerticalSpace = true;
-		span3.heightHint = 50;
-
-		fErr = new Text(instanceConfigurationGroup, SWT.WRAP
-				| SWT.V_SCROLL | SWT.READ_ONLY);
-		fErr.setLayoutData(span3);
-	}
-
-}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/ResetAcceleoHandler.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/ResetAcceleoHandler.java
deleted file mode 100644
index b15a519e978..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/ResetAcceleoHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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 (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.acceleo.debug.handlers;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.papyrus.acceleo.AcceleoDriver;
-import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-
-public class ResetAcceleoHandler extends CmdHandler {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isEnabled() {
-		updateSelectedEObject();
-		if (selectedEObject instanceof Element) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		if (selectedEObject instanceof NamedElement) {
-			AcceleoDriver.init();
-		}
-		return null;
-	}
-}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/TestAcceleoHandler.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/TestAcceleoHandler.java
deleted file mode 100644
index a254e6889e5..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/TestAcceleoHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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 (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.acceleo.debug.handlers;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.papyrus.acceleo.debug.dialogs.TestAcceleoDialog;
-import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * Test the Acceleo handler: call a dialog that opens the
- *
- * @author ansgar
- *
- */
-public class TestAcceleoHandler extends CmdHandler {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isEnabled() {
-		updateSelectedEObject();
-		if (selectedEObject instanceof NamedElement) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		if (selectedEObject instanceof NamedElement) {
-			Display.getDefault().syncExec(new Runnable() {
-				@Override
-				public void run() {
-					new TestAcceleoDialog(Display.getCurrent().getActiveShell(), (NamedElement) selectedEObject).open();
-				}
-			});
-		}
-		return null;
-	}
-}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index c31262c4733..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore;bundle-version="2.10.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Acceleo UI (Incubation)

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.acceleo.ui.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.acceleo.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/plugin.xml b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/plugin.xml
deleted file mode 100644
index 10ffe8d6e48..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<extension
-         point="org.eclipse.ui.menus">
-	<menuContribution
-		allPopups="true"
-		locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
-		<menu
-			icon="icons/codegen-16x16.gif"
-			id="org.eclipse.papyrus.views.modelexplorer.popup.codegen"
-			label="Code generation">
-		</menu>
-	</menuContribution>
-	<menuContribution
-		allPopups="true"
-		locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">
-		<menu
-			icon="icons/codegen-16x16.gif"
-			id="org.eclipse.papyrus.views.modelexplorer.popup.codegen"
-			label="Code generation">
-		</menu>
-	</menuContribution>
-</extension>
-</plugin>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/Activator.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/Activator.java
deleted file mode 100644
index edaa9308ab4..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/Activator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.papyrus.acceleo.ui;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.acceleo.ui"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
deleted file mode 100644
index f605e91b746..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.acceleo

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.acceleo.engine;bundle-version="3.2.2",

- org.eclipse.acceleo.parser;bundle-version="3.2.2",

- org.eclipse.uml2.uml;bundle-version="4.0.2",

- org.eclipse.core.filesystem;bundle-version="1.3.200",

- org.eclipse.core.resources

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.acceleo.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.acceleo;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/build.properties b/extraplugins/codegen/org.eclipse.papyrus.acceleo/build.properties
deleted file mode 100644
index 5f3abe40576..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-#Fri Aug 09 14:41:33 CEST 2013
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties,\
-               build.acceleo
-output..=bin/
-src.includes=about.html
-source..=src/
-customBuildCallbacks=build.acceleo
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/AcceleoDriver.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/AcceleoDriver.java
deleted file mode 100644
index cd5bb42bb0c..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/AcceleoDriver.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/**
- * Copyright CEA-LIST 2009
- * available under EPL 1.0 licence
- *
- * This file is part of the Qompass tool chain (www.ec3m.net)
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * $Id$
- */
-
-package org.eclipse.papyrus.acceleo;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.acceleo.common.IAcceleoConstants;
-import org.eclipse.acceleo.engine.AcceleoEnginePlugin;
-import org.eclipse.acceleo.engine.AcceleoEvaluationException;
-import org.eclipse.acceleo.engine.generation.AcceleoEngine;
-import org.eclipse.acceleo.engine.generation.strategy.PreviewStrategy;
-import org.eclipse.acceleo.model.mtl.Module;
-import org.eclipse.acceleo.model.mtl.ModuleElement;
-import org.eclipse.acceleo.model.mtl.Template;
-import org.eclipse.acceleo.model.mtl.resource.AcceleoResourceSetImpl;
-import org.eclipse.acceleo.parser.AcceleoParser;
-import org.eclipse.acceleo.parser.AcceleoSourceBuffer;
-import org.eclipse.acceleo.parser.cst.ModuleImportsValue;
-import org.eclipse.core.runtime.ILogListener;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.ocl.ecore.EcoreEnvironment;
-import org.eclipse.ocl.ecore.EcoreOCLStandardLibrary;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.OpaqueBehavior;
-
-/**
- * This class enables the binding of an Acceleo template with a UML element while returning a String
- *  
- * @author ansgar
- *
- * @deprecated Since this class is no longer used by Qompass, it will eventually be removed
- */
-@Deprecated
-public class AcceleoDriver {
-
-	public final static String UML_URI = "http://www.eclipse.org/uml2/5.0.0/UML"; //$NON-NLS-1$
-
-	public final static String DOT = "."; //$NON-NLS-1$
-
-	/**
-	 * URI of file that is currently evaluated
-	 */
-	public static final URI currentURI = URI.createURI("current." + IAcceleoConstants.EMTL_FILE_EXTENSION); //$NON-NLS-1$
-
-	public static void init() {
-		engine = new AcceleoEngine();
-		parser = new AcceleoParser();
-		hasErrors = false;
-		lastErrors = false;
-		// some errors are silently captured inside the evaluation query (@see AcceleoEvaluationVisiton.visitExpression). Yet they produce
-		// an event in the Acceleo log which is captured via this listener.
-		AcceleoEnginePlugin.getDefault().getLog().addLogListener(new ILogListener() {
-
-			@Override
-			public void logging(IStatus status, String plugin) {
-				hasErrors = true;
-				lastErrors = true;
-			}
-		});
-		acceleoResourceSet = new AcceleoResourceSetImpl();
-		acceleoResourceSet.createResource(currentURI);
-		acceleoResourceSet.getPackageRegistry().put(
-				EcoreEnvironment.OCL_STANDARD_LIBRARY_NS_URI,
-				new EcoreOCLStandardLibrary().getOCLStdLibPackage());
-	}
-
-	/**
-	 * Execute a script passed as parameter. It will be executed in the context
-	 * of a base script that declares the meta-model (UML2) and has additional
-	 * imports (currently none).
-	 *
-	 * @param template
-	 *            The template in string form
-	 * @param element
-	 *            The UML element to which the template is applied
-	 * @return the evaluated template
-	 */
-	public static String bind(String templateStr, Element element) throws AcceleoException {
-		return evaluate(templateStr, element, null);
-	}
-
-	/**
-	 * find an MTL file in a plugin. This functions assumes that the relative path (to a "bin" folder) within the
-	 * plugin includes the plug-in name as a prefix
-	 *
-	 * @param moduleName
-	 *            qualified name within the plug-in (assuming that the associated file is located
-	 *            in a sub-folder with the name "bin")
-	 */
-	public static URI findFileInPlugin(String moduleName) {
-		String relativePath = moduleName.replace(IAcceleoConstants.NAMESPACE_SEPARATOR, File.separator);
-		String segments[] = moduleName.split(IAcceleoConstants.NAMESPACE_SEPARATOR);
-
-		for (int pass = 0; pass < 2; pass++) {
-			// try bin directory in first pass (deployed plugins: don't use bin, devel: use bin).
-			// Problem: resource is also found without bin, but resolving fails later
-			String binSep = (pass == 0) ? "/bin/" : "/"; //$NON-NLS-1$//$NON-NLS-2$
-			for (int segmentLen = segments.length - 1; segmentLen > 1; segmentLen--) {
-				String pluginNameCandidate = segments[0];
-				for (int i = 1; i < segmentLen; i++) {
-					pluginNameCandidate += DOT + segments[i];
-				}
-
-				String fileNameCandidate = pluginNameCandidate + binSep + relativePath +
-						DOT + IAcceleoConstants.EMTL_FILE_EXTENSION;
-
-				URI uri = URI.createPlatformPluginURI(fileNameCandidate, true);
-				if (pass == 0) {
-					// Use absolute path during first pass, i.e. try to load Acceleo module
-					// at an absolute position.
-					// This is required, since Acceleo references dependent files using a relative
-					// path. This applies to debugging in 2nd instance only, if a plugin is deployed,
-					// references within the EMTL file become platform:/plugin references and the
-					// EMTL file itself should also be loaded using a platform:/plugin reference.
-					//
-					// Caveat: assure that plugins with profile or meta-model definitions are NOT present
-					// in your debugging workspace, since they might get loaded twice which leads to
-					// incompatible Java objects denoting the same element (e.g. two instance of Classifier MM
-					// element). See bug 351137.
-
-					String absoluteFileName = Utils.getAbsoluteFN(uri.toString());
-					if (absoluteFileName != null) {
-						File fileCandidate = new File(absoluteFileName);
-						if (fileCandidate.exists()) {
-							return URI.createFileURI(fileCandidate.getAbsolutePath());
-						}
-					}
-				}
-				else {
-					try {
-						Resource r = acceleoResourceSet.getResource(uri, true);
-						if (r != null) {
-							return uri;
-						}
-					} catch (Exception e) {
-						// the URI has been added to the resource set, although there is an exception.
-						removeURIfromResourceSet(uri);
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Small helper: remove a URI from the AcceleoResourceSet
-	 *
-	 * @param uri
-	 */
-	protected static void removeURIfromResourceSet(URI uri) {
-		for (Resource resource : acceleoResourceSet.getResources()) {
-			if (resource.getURI() == uri) {
-				acceleoResourceSet.getResources().remove(resource);
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Evaluate an Acceleo template
-	 *
-	 * @param ob
-	 *            An opaque behavior whose first body contains an Acceleo template that should be evaluated
-	 * @param element
-	 *            The UML element to which the template is applied
-	 * @param args
-	 *            an array of arguments that are passed to the template. Each argument
-	 *            must be either an EObject, a String, an Integer or a Boolean
-	 *            (TODO: currently not evaluated)
-	 * @return the evaluated template
-	 * @return
-	 * @throws AcceleoException
-	 */
-	public static String evaluate(OpaqueBehavior b, Element element, Object args[]) throws AcceleoException {
-		// script = null;
-		if (b.getBodies().size() > 0) {
-			String body = b.getBodies().get(0);
-			return evaluate(body, b.getQualifiedName(), element, args);
-		}
-		return null;
-	}
-
-	/**
-	 * Evaluate an Acceleo template
-	 *
-	 * @param template
-	 *            The template in string form
-	 * @param element
-	 *            The UML element to which the template is applied
-	 * @param args
-	 *            an array of arguments that are passed to the template. Each argument
-	 *            must be either an EObject, a String, an Integer or a Boolean
-	 *            (TODO: currently not evaluated)
-	 * @return the evaluated template
-	 */
-	public static String evaluate(String templateStr, Element element, Object args[]) throws AcceleoException {
-		return evaluate(templateStr, "dummy", element, args); //$NON-NLS-1$
-	}
-
-	/**
-	 * Evaluate an Acceleo template
-	 *
-	 * @param templateStr
-	 *            The acceleo template in string form
-	 * @param templateName
-	 *            The name under which a template can be identified, i.e. the file name
-	 *            if the template is stored in a file and the qualified name of the model element (opaque
-	 *            behavior) if the template is stored within the model.
-	 * @param element
-	 *            The UML element to which the template is applied
-	 * @param args
-	 *            an array of arguments that are passed to the template. Each argument
-	 *            must be either an EObject, a String, an Integer or a Boolean
-	 *            (TODO: currently not evaluated)
-	 * @return the evaluated template
-	 * @throws AcceleoException
-	 */
-	public static String evaluate(String templateStr, String templateName, Element element, Object args[]) throws AcceleoException {
-		if (templateStr == null) {
-			return null;
-		}
-
-		if (engine == null) {
-			init();
-		}
-
-		// support non declaration of a template for default naming operations
-		if (!(templateStr.startsWith("[import") || //$NON-NLS-1$
-				templateStr.startsWith("[template") || //$NON-NLS-1$
-		templateStr.startsWith("[module"))) { //$NON-NLS-1$
-			templateStr = "[template public dummy(ne : NamedElement)]\n" + templateStr + //$NON-NLS-1$
-					"\n[/template]\n"; //$NON-NLS-1$
-		}
-
-		// module names are not relevant, since passed templates can not be called by others
-		if (!templateStr.startsWith("[module")) { //$NON-NLS-1$
-			templateStr = "[module dummyMod('" + UML_URI + "')/]\n\n" + templateStr; //$NON-NLS-1$//$NON-NLS-2$
-		}
-
-		// Strategy:
-		// 1. Use AcceleoParser to transform text (OpaqueExpression) into Module
-		// => list of dependencies via explicit import statements
-		// 2. Use AcceleoEngine to resolve expression.
-
-		// Strategy first: parse imports: verify, if already in resourceSet
-
-		AcceleoSourceBuffer sourceBuffer = new AcceleoSourceBuffer(new StringBuffer(templateStr));
-
-		Resource resource = acceleoResourceSet.getResource(currentURI, false);
-
-		try {
-			EList<URI> depURIs = new BasicEList<URI>();
-			lastErrors = false;
-			// deps.add(outputURI);
-
-			// check, if imports are already in resource set
-			sourceBuffer.createCST();
-			for (ModuleImportsValue importValue : sourceBuffer.getCST().getImports()) {
-				String importedModuleName = importValue.getName();
-				if (importedModuleName != null) {
-					// String pathName = importedModuleName.replace(IAcceleoConstants.NAMESPACE_SEPARATOR, File.separator);
-
-					URI depURI = findFileInPlugin(importedModuleName);
-					if (depURI != null) {
-						depURIs.add(depURI);
-						// Resource r = acceleoResourceSet.getResource(depURI, true);
-					}
-					else {
-						throw new AcceleoException("Could not find imported module:\n" + importedModuleName + "\n\n" +
-								"The module (in compiled form, i.e. with .emtl) is searched in the path corresponding to its qualified name " +
-								"(starting with the \"bin\" directory, if a source plugin) of dependend plug-ins. Verify that these have the " +
-								"Acceleo nature");
-					}
-				}
-			}
-
-			// parse imported files - not required, EMTL files exist already
-			// parser.parse(depInputFiles, outputURIs, new BasicEList<URI>(), null, new BasicMonitor());
-
-			parser.parse(sourceBuffer, resource, depURIs);
-			if (sourceBuffer.getProblems().getList() != null) {
-				if (sourceBuffer.getProblems().getList().size() > 0) {
-					throw new AcceleoException("Acceleo problem: " + sourceBuffer.getProblems().getMessage() +
-							"\n\nTemplate: " + templateName + "\n" + templateStr);
-				}
-			}
-			String result = evaluateResource(resource, element, templateName, templateStr);
-			if (result != null) {
-				return result;
-			}
-
-		} catch (AcceleoEvaluationException e) {
-			String elementStr = (element instanceof NamedElement ? ((NamedElement) element).getQualifiedName() : element.toString());
-			throw new AcceleoException("Acceleo EvaluationException" + e + "\n\nPassed element: " + elementStr +
-					"\n\nTemplate: " + templateName + "\n" + templateStr);
-		}
-		String elementStr = (element instanceof NamedElement ? ((NamedElement) element).getQualifiedName() : element.toString());
-		throw new AcceleoException("Acceleo evaluation error\n\nPassed element: " + elementStr +
-				"\n\nTemplate: " + templateName + "\n" + templateStr);
-	}
-
-	/**
-	 * Evaluate a template within the given module. Assume that the template has the same name as
-	 * the module. If this is not the case, use the function below
-	 *
-	 * @param moduleName
-	 *            a qualified Acceleo module name, elements are separated by '::'
-	 * @param element
-	 * @return
-	 */
-	public static String evaluateURI(String moduleName, Element element) {
-		int index = moduleName.lastIndexOf("::"); //$NON-NLS-1$
-		String templateName = (index == -1) ? moduleName : moduleName.substring(index + 2);
-		return evaluateURI(moduleName, templateName, element);
-	}
-
-
-	public static String evaluateURI(String moduleName, String templateName, Element element) {
-		// throws AcceleoException {
-		if (engine == null) {
-			init();
-		}
-		try {
-			// return evaluateURI(URI.createURI("org.eclipse.papyrus.cpp.codegen" + "/" + uriStr.replace(DOT, "/") + DOT + IAcceleoConstants.EMTL_FILE_EXTENSION), element);
-			URI uri = findFileInPlugin(moduleName);
-			if (uri == null) {
-				throw new RuntimeException("Cannot find Acceleo module " + moduleName + //$NON-NLS-1$
-						". Check whether the .emtl file exists and whether it is exported"); //$NON-NLS-1$
-			}
-			return evaluateURI(uri, templateName, element);
-		} catch (AcceleoException e) {
-		}
-		return null;
-	}
-
-	public static String evaluateURI(URI uri, String templateName, Element element) throws AcceleoException {
-
-		if (engine == null) {
-			init();
-		}
-
-		Resource resource = acceleoResourceSet.getResource(uri, true);
-		if (resource != null) {
-			return evaluateResource(resource, element, templateName, ""); //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	/**
-	 * Evaluate an Acceleo template when given a resource, template name
-	 *
-	 * @param resource
-	 *            The resource of an Acceleo module
-	 * @param element
-	 *            the UML model element that is passed (
-	 * @param templateName
-	 *            the name of the template
-	 * @param templateStr
-	 *            the contents of the template. May be empty (only used for
-	 *            error messages
-	 * @return the evaluated template
-	 * @throws AcceleoException
-	 */
-	protected static String evaluateResource(Resource resource, Element element, String templateName, String templateStr) throws AcceleoException {
-		if (resource.getContents().size() > 0) {
-			EObject result = resource.getContents().get(0);
-			List<Object> arguments = new ArrayList<Object>();
-			// The input model itself is a potential argument
-			arguments.add(element);
-			if (result instanceof Module) {
-				Module module = (Module) result;
-				// do not check the template name, if there is only one.
-				boolean dontCheck = (module.getOwnedModuleElement().size() == 1);
-				for (ModuleElement me : module.getOwnedModuleElement()) {
-					if ((me instanceof Template) && (dontCheck || me.getName().equals(templateName))) {
-						lastErrors = false;
-						Object stringResult = engine.evaluate((Template) me, arguments, new PreviewStrategy(), null);
-						if (lastErrors) {
-							// we do not throw an exception, since it would imply that the evaluation result is
-							// lost. For a users, the (partially) evaluated result might be more useful to locate
-							// the problem than the actual error message.
-							// log additional info about template, which are not present in the Acceleo log
-							String message = "an acceleo error occurred during the evaluation of template <" + //$NON-NLS-1$
-									templateName + ">. Check previous errors in the log."; //$NON-NLS-1$
-							if (templateStr.length() > 0) {
-								message += "Template contents:\n" + templateStr; //$NON-NLS-1$
-							}
-							AcceleoEnginePlugin.getDefault().getLog().log(
-									new Status(IStatus.INFO, AcceleoEnginePlugin.PLUGIN_ID, message));
-						}
-						if (stringResult instanceof String) {
-							return (String) stringResult;
-						}
-					}
-				}
-			}
-		}
-		throw new AcceleoEvaluationException("Template " + templateName + " not found");
-	}
-
-	public static void clearErrors() {
-		hasErrors = false;
-		lastErrors = false;
-	}
-
-	public static boolean hasErrors() {
-		return hasErrors;
-	}
-
-	protected static boolean hasErrors;
-
-	protected static boolean lastErrors;
-
-	protected static AcceleoEngine engine = null;
-
-	protected static ResourceSet acceleoResourceSet;
-
-	protected static AcceleoParser parser;
-}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/AcceleoException.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/AcceleoException.java
deleted file mode 100644
index 655a042eac6..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/AcceleoException.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.papyrus.acceleo;
-
-
-public class AcceleoException extends Exception {
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1548461326327727987L;
-
-	public AcceleoException(String reason) {
-		super(reason);
-	}
-}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.emtl b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.emtl
deleted file mode 100644
index 7e5552ff18b..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.emtl
+++ /dev/null
@@ -1,2692 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="GenUtils" nsURI="org::eclipse::papyrus::acceleo::GenUtils" startHeaderPosition="29" endHeaderPosition="86">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <ownedModuleElement xsi:type="mtl:Query" name="getTemplateBindings" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTemplateBindings(org.eclipse.uml2.uml.Class)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Class)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getTemplateBindings/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="isTemplateBoundElement" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="isTemplateBoundElement(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/isTemplateBoundElement/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getTemplateName" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTemplateName(org.eclipse.uml2.uml.TemplateParameter)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(TemplateParameter)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getTemplateName/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getTemplateParameters" visibility="Public" type="/3/Collection(TemplateParameter)">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTemplateParameters(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getTemplateParameters/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getTemplateParameteredElements" visibility="Public" type="/3/Collection(Classifier)">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTemplateParameteredElements(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getTemplateParameteredElements/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getOwnedAttributeTypes" visibility="Public" type="/3/Sequence(Classifier)">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/20">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getOwnedAttributeTypes(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getOwnedAttributeTypes/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getTypesViaAttributes" visibility="Public" type="/3/Sequence(Classifier)">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTypesViaAttributes(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getTypesViaAttributes/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getTypesViaOperations" visibility="Public" type="/3/Sequence(Classifier)">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/26">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTypesViaOperations(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getTypesViaOperations/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getTypesViaRelationships" visibility="Public" type="/3/Sequence(Classifier)">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/29">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTypesViaRelationships(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getTypesViaRelationships/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getTypesViaDependencies" visibility="Public" type="/3/Sequence(Classifier)">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTypesViaDependencies(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getTypesViaDependencies/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getTypesViaRelationshipsNoDeps" visibility="Public" type="/3/Sequence(Classifier)">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTypesViaRelationshipsNoDeps(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getTypesViaRelationshipsNoDeps/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getFullName" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/38">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getFullName(org.eclipse.uml2.uml.NamedElement)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(NamedElement)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getFullName/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getFullNameUC" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/41">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getFullNameUC(org.eclipse.uml2.uml.NamedElement)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(NamedElement)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getFullNameUC/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getComments" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/44">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getComments(org.eclipse.uml2.uml.Element)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Element)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getComments/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getUsedPackages" visibility="Public" type="/3/Sequence(Package)">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/47">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getUsedPackages(org.eclipse.uml2.uml.Package)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Package)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getUsedPackages/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getUsedClassifiers" visibility="Public" type="/3/Sequence(Classifier)">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/50">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getUsedClassifiers(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getUsedClassifiers/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getFullPath" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/53">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getFullPath(org.eclipse.uml2.uml.Package)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Package)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getFullPath/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="hasStereotype" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <parameter name="arg1">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/56">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="hasStereotype(org.eclipse.uml2.uml.Element, java.lang.String)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclAny)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/hasStereotype/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </item>
-          </part>
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg1" referredVariable="/0/hasStereotype/arg1">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="3754" endPosition="3932" value=" use OclAny instead of EClass, since Acceleo does not consider a passed stereotype (such as C_Cpp::Ptr) as EClass compatible - although the passed value is technically an eclass "/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="hasStereotype" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <parameter name="definition">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/59">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="hasStereotypeA(org.eclipse.uml2.uml.Element, org.eclipse.emf.ecore.EClass)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclAny)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/hasStereotype.1/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </item>
-          </part>
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="definition" referredVariable="/0/hasStereotype.1/definition">
-              <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="hasStereotypeTree" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <parameter name="definition">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/62">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="hasStereotypeTree(org.eclipse.uml2.uml.Element, org.eclipse.emf.ecore.EClass)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclAny)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/hasStereotypeTree/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </item>
-          </part>
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="definition" referredVariable="/0/hasStereotypeTree/definition">
-              <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getApplication" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <parameter name="arg1">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/65">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getApplicationA(org.eclipse.uml2.uml.Element, org.eclipse.emf.ecore.EClass)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclAny)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getApplication/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </item>
-          </part>
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg1" referredVariable="/0/getApplication/arg1">
-              <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getApplicationTree" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <parameter name="arg1">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/68">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getApplicationTreeA(org.eclipse.uml2.uml.Element, org.eclipse.emf.ecore.EClass)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclAny)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getApplicationTree/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </item>
-          </part>
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg1" referredVariable="/0/getApplicationTree/arg1">
-              <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getBody" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-      <parameter name="arg1">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/71">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getBody(org.eclipse.uml2.uml.Operation, java.lang.String)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclAny)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getBody/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </item>
-          </part>
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg1" referredVariable="/0/getBody/arg1">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getBodyFromOB" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </parameter>
-      <parameter name="arg1">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/74">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getBodyFromOB(org.eclipse.uml2.uml.OpaqueBehavior, java.lang.String)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclAny)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getBodyFromOB/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-            </item>
-          </part>
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg1" referredVariable="/0/getBodyFromOB/arg1">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="cleanCR" visibility="Public">
-      <parameter name="str">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="cleanCR(java.lang.String)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(String)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="str" referredVariable="/0/cleanCR/str">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="maskNull" visibility="Public">
-      <parameter name="str">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/80">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="maskNull(java.lang.String)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(String)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="str" referredVariable="/0/maskNull/str">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getRelativePath" visibility="Public">
-      <parameter name="ne1">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-      <parameter name="ne2">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getRelativePath(org.eclipse.uml2.uml.NamedElement, org.eclipse.uml2.uml.NamedElement)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(NamedElement)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="ne1" referredVariable="/0/getRelativePath/ne1">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            </item>
-          </part>
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="ne2" referredVariable="/0/getRelativePath/ne2">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="returnResult" visibility="Public">
-      <parameter name="behavior">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/86">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.codegen.base.GenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="returnResult(org.eclipse.uml2.uml.Behavior)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Behavior)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="behavior" referredVariable="/0/returnResult/behavior">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="getTemplateBindings">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getTemplateBindings"/>
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="isTemplateBoundElement">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/isTemplateBoundElement"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTemplateName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getTemplateName"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTemplateParameters" eType="/3/Collection(TemplateParameter)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getTemplateParameters"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTemplateParameteredElements" eType="/3/Collection(Classifier)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getTemplateParameteredElements"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getOwnedAttributeTypes" eType="/3/Sequence(Classifier)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getOwnedAttributeTypes"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTypesViaAttributes" eType="/3/Sequence(Classifier)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getTypesViaAttributes"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTypesViaOperations" eType="/3/Sequence(Classifier)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getTypesViaOperations"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTypesViaRelationships" eType="/3/Sequence(Classifier)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getTypesViaRelationships"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTypesViaDependencies" eType="/3/Sequence(Classifier)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getTypesViaDependencies"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTypesViaRelationshipsNoDeps" eType="/3/Sequence(Classifier)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getTypesViaRelationshipsNoDeps"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getFullName"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullNameUC">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getFullNameUC"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getComments">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getComments"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getUsedPackages" eType="/3/Sequence(Package)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getUsedPackages"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getUsedClassifiers" eType="/3/Sequence(Classifier)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getUsedClassifiers"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullPath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getFullPath"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/hasStereotype"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/hasStereotype.1"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotypeTree">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/hasStereotypeTree"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getApplication">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getApplication"/>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getApplicationTree">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getApplicationTree"/>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getBody">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getBody"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getBodyFromOB">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getBodyFromOB"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cleanCR">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/cleanCR"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="str">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="maskNull">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/maskNull"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="str">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getRelativePath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getRelativePath"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne1">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-        <eParameters name="ne2">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="returnResult">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/returnResult"/>
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-        <eParameters name="behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-      <eOperations name="invoke">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="class">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="method">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="arguments">
-          <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:CollectionType" name="Collection(TemplateParameter)">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:CollectionType" name="Collection(Classifier)">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Classifier)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Package)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Class)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(TemplateParameter)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(NamedElement)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Element)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(String)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Behavior)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/getTemplateBindings">
-      <details key="start" value="90"/>
-      <details key="end" value="280"/>
-      <details key="line" value="4"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/getTemplateBindings/arg0">
-      <details key="start" value="124"/>
-      <details key="end" value="136"/>
-      <details key="line" value="4"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/getTemplateBindings/%">
-      <details key="start" value="159"/>
-      <details key="end" value="277"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/getTemplateBindings/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/getTemplateBindings/%/%">
-      <details key="start" value="166"/>
-      <details key="end" value="209"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/getTemplateBindings/%/%.1">
-      <details key="start" value="211"/>
-      <details key="end" value="260"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/getTemplateBindings/%/%.2">
-      <details key="start" value="262"/>
-      <details key="end" value="276"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/getTemplateBindings/%/%.2/%/arg0">
-      <details key="start" value="271"/>
-      <details key="end" value="275"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/isTemplateBoundElement">
-      <details key="start" value="282"/>
-      <details key="end" value="480"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/isTemplateBoundElement/arg0">
-      <details key="start" value="319"/>
-      <details key="end" value="336"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/isTemplateBoundElement/%">
-      <details key="start" value="351"/>
-      <details key="end" value="477"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/isTemplateBoundElement/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/isTemplateBoundElement/%/%">
-      <details key="start" value="358"/>
-      <details key="end" value="401"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/isTemplateBoundElement/%/%.1">
-      <details key="start" value="403"/>
-      <details key="end" value="460"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/isTemplateBoundElement/%/%.2">
-      <details key="start" value="462"/>
-      <details key="end" value="476"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/isTemplateBoundElement/%/%.2/%/arg0">
-      <details key="start" value="471"/>
-      <details key="end" value="475"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/getTemplateName">
-      <details key="start" value="482"/>
-      <details key="end" value="679"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/getTemplateName/arg0">
-      <details key="start" value="512"/>
-      <details key="end" value="536"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/getTemplateName/%">
-      <details key="start" value="550"/>
-      <details key="end" value="676"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/getTemplateName/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/getTemplateName/%/%">
-      <details key="start" value="557"/>
-      <details key="end" value="600"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/getTemplateName/%/%.1">
-      <details key="start" value="602"/>
-      <details key="end" value="659"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/getTemplateName/%/%.2">
-      <details key="start" value="661"/>
-      <details key="end" value="675"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/getTemplateName/%/%.2/%/arg0">
-      <details key="start" value="670"/>
-      <details key="end" value="674"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/getTemplateParameters">
-      <details key="start" value="681"/>
-      <details key="end" value="899"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/getTemplateParameters/arg0">
-      <details key="start" value="717"/>
-      <details key="end" value="734"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/getTemplateParameters/%">
-      <details key="start" value="771"/>
-      <details key="end" value="896"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/getTemplateParameters/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/getTemplateParameters/%/%">
-      <details key="start" value="778"/>
-      <details key="end" value="821"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/getTemplateParameters/%/%.1">
-      <details key="start" value="823"/>
-      <details key="end" value="879"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/getTemplateParameters/%/%.2">
-      <details key="start" value="881"/>
-      <details key="end" value="895"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/getTemplateParameters/%/%.2/%/arg0">
-      <details key="start" value="890"/>
-      <details key="end" value="894"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/getTemplateParameteredElements">
-      <details key="start" value="901"/>
-      <details key="end" value="1130"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/getTemplateParameteredElements/arg0">
-      <details key="start" value="946"/>
-      <details key="end" value="963"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/getTemplateParameteredElements/%">
-      <details key="start" value="993"/>
-      <details key="end" value="1127"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/getTemplateParameteredElements/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/getTemplateParameteredElements/%/%">
-      <details key="start" value="1000"/>
-      <details key="end" value="1043"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/getTemplateParameteredElements/%/%.1">
-      <details key="start" value="1045"/>
-      <details key="end" value="1110"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/getTemplateParameteredElements/%/%.2">
-      <details key="start" value="1112"/>
-      <details key="end" value="1126"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/getTemplateParameteredElements/%/%.2/%/arg0">
-      <details key="start" value="1121"/>
-      <details key="end" value="1125"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/getOwnedAttributeTypes">
-      <details key="start" value="1132"/>
-      <details key="end" value="1343"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/getOwnedAttributeTypes/arg0">
-      <details key="start" value="1169"/>
-      <details key="end" value="1186"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/getOwnedAttributeTypes/%">
-      <details key="start" value="1214"/>
-      <details key="end" value="1340"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/getOwnedAttributeTypes/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/getOwnedAttributeTypes/%/%">
-      <details key="start" value="1221"/>
-      <details key="end" value="1264"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/getOwnedAttributeTypes/%/%.1">
-      <details key="start" value="1266"/>
-      <details key="end" value="1323"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/getOwnedAttributeTypes/%/%.2">
-      <details key="start" value="1325"/>
-      <details key="end" value="1339"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/getOwnedAttributeTypes/%/%.2/%/arg0">
-      <details key="start" value="1334"/>
-      <details key="end" value="1338"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/getTypesViaAttributes">
-      <details key="start" value="1345"/>
-      <details key="end" value="1554"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/getTypesViaAttributes/arg0">
-      <details key="start" value="1381"/>
-      <details key="end" value="1398"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/getTypesViaAttributes/%">
-      <details key="start" value="1426"/>
-      <details key="end" value="1551"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/getTypesViaAttributes/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/getTypesViaAttributes/%/%">
-      <details key="start" value="1433"/>
-      <details key="end" value="1476"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/getTypesViaAttributes/%/%.1">
-      <details key="start" value="1478"/>
-      <details key="end" value="1534"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/getTypesViaAttributes/%/%.2">
-      <details key="start" value="1536"/>
-      <details key="end" value="1550"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/getTypesViaAttributes/%/%.2/%/arg0">
-      <details key="start" value="1545"/>
-      <details key="end" value="1549"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/getTypesViaOperations">
-      <details key="start" value="1556"/>
-      <details key="end" value="1765"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/getTypesViaOperations/arg0">
-      <details key="start" value="1592"/>
-      <details key="end" value="1609"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/getTypesViaOperations/%">
-      <details key="start" value="1637"/>
-      <details key="end" value="1762"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/getTypesViaOperations/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/getTypesViaOperations/%/%">
-      <details key="start" value="1644"/>
-      <details key="end" value="1687"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/getTypesViaOperations/%/%.1">
-      <details key="start" value="1689"/>
-      <details key="end" value="1745"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/getTypesViaOperations/%/%.2">
-      <details key="start" value="1747"/>
-      <details key="end" value="1761"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/getTypesViaOperations/%/%.2/%/arg0">
-      <details key="start" value="1756"/>
-      <details key="end" value="1760"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/getTypesViaRelationships">
-      <details key="start" value="1767"/>
-      <details key="end" value="1982"/>
-      <details key="line" value="36"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/getTypesViaRelationships/arg0">
-      <details key="start" value="1806"/>
-      <details key="end" value="1823"/>
-      <details key="line" value="36"/>
-    </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/getTypesViaRelationships/%">
-      <details key="start" value="1851"/>
-      <details key="end" value="1979"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/getTypesViaRelationships/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/getTypesViaRelationships/%/%">
-      <details key="start" value="1858"/>
-      <details key="end" value="1901"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/getTypesViaRelationships/%/%.1">
-      <details key="start" value="1903"/>
-      <details key="end" value="1962"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/getTypesViaRelationships/%/%.2">
-      <details key="start" value="1964"/>
-      <details key="end" value="1978"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/getTypesViaRelationships/%/%.2/%/arg0">
-      <details key="start" value="1973"/>
-      <details key="end" value="1977"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/getTypesViaDependencies">
-      <details key="start" value="1984"/>
-      <details key="end" value="2197"/>
-      <details key="line" value="40"/>
-    </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/getTypesViaDependencies/arg0">
-      <details key="start" value="2022"/>
-      <details key="end" value="2039"/>
-      <details key="line" value="40"/>
-    </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/getTypesViaDependencies/%">
-      <details key="start" value="2067"/>
-      <details key="end" value="2194"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/getTypesViaDependencies/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/getTypesViaDependencies/%/%">
-      <details key="start" value="2074"/>
-      <details key="end" value="2117"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/getTypesViaDependencies/%/%.1">
-      <details key="start" value="2119"/>
-      <details key="end" value="2177"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/getTypesViaDependencies/%/%.2">
-      <details key="start" value="2179"/>
-      <details key="end" value="2193"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.79" references="/0/getTypesViaDependencies/%/%.2/%/arg0">
-      <details key="start" value="2188"/>
-      <details key="end" value="2192"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.80" references="/0/getTypesViaRelationshipsNoDeps">
-      <details key="start" value="2199"/>
-      <details key="end" value="2426"/>
-      <details key="line" value="44"/>
-    </eAnnotations>
-    <eAnnotations source="positions.81" references="/0/getTypesViaRelationshipsNoDeps/arg0">
-      <details key="start" value="2244"/>
-      <details key="end" value="2261"/>
-      <details key="line" value="44"/>
-    </eAnnotations>
-    <eAnnotations source="positions.82" references="/0/getTypesViaRelationshipsNoDeps/%">
-      <details key="start" value="2289"/>
-      <details key="end" value="2423"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.83" references="/0/getTypesViaRelationshipsNoDeps/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.84" references="/0/getTypesViaRelationshipsNoDeps/%/%">
-      <details key="start" value="2296"/>
-      <details key="end" value="2339"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.85" references="/0/getTypesViaRelationshipsNoDeps/%/%.1">
-      <details key="start" value="2341"/>
-      <details key="end" value="2406"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.86" references="/0/getTypesViaRelationshipsNoDeps/%/%.2">
-      <details key="start" value="2408"/>
-      <details key="end" value="2422"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.87" references="/0/getTypesViaRelationshipsNoDeps/%/%.2/%/arg0">
-      <details key="start" value="2417"/>
-      <details key="end" value="2421"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.88" references="/0/getFullName">
-      <details key="start" value="2428"/>
-      <details key="end" value="2607"/>
-      <details key="line" value="48"/>
-    </eAnnotations>
-    <eAnnotations source="positions.89" references="/0/getFullName/arg0">
-      <details key="start" value="2454"/>
-      <details key="end" value="2473"/>
-      <details key="line" value="48"/>
-    </eAnnotations>
-    <eAnnotations source="positions.90" references="/0/getFullName/%">
-      <details key="start" value="2487"/>
-      <details key="end" value="2604"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.91" references="/0/getFullName/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.92" references="/0/getFullName/%/%">
-      <details key="start" value="2494"/>
-      <details key="end" value="2537"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.93" references="/0/getFullName/%/%.1">
-      <details key="start" value="2539"/>
-      <details key="end" value="2587"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.94" references="/0/getFullName/%/%.2">
-      <details key="start" value="2589"/>
-      <details key="end" value="2603"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.95" references="/0/getFullName/%/%.2/%/arg0">
-      <details key="start" value="2598"/>
-      <details key="end" value="2602"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.96" references="/0/getFullNameUC">
-      <details key="start" value="2609"/>
-      <details key="end" value="2792"/>
-      <details key="line" value="52"/>
-    </eAnnotations>
-    <eAnnotations source="positions.97" references="/0/getFullNameUC/arg0">
-      <details key="start" value="2637"/>
-      <details key="end" value="2656"/>
-      <details key="line" value="52"/>
-    </eAnnotations>
-    <eAnnotations source="positions.98" references="/0/getFullNameUC/%">
-      <details key="start" value="2670"/>
-      <details key="end" value="2789"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.99" references="/0/getFullNameUC/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.100" references="/0/getFullNameUC/%/%">
-      <details key="start" value="2677"/>
-      <details key="end" value="2720"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.101" references="/0/getFullNameUC/%/%.1">
-      <details key="start" value="2722"/>
-      <details key="end" value="2772"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.102" references="/0/getFullNameUC/%/%.2">
-      <details key="start" value="2774"/>
-      <details key="end" value="2788"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.103" references="/0/getFullNameUC/%/%.2/%/arg0">
-      <details key="start" value="2783"/>
-      <details key="end" value="2787"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.104" references="/0/getComments">
-      <details key="start" value="2794"/>
-      <details key="end" value="2963"/>
-      <details key="line" value="56"/>
-    </eAnnotations>
-    <eAnnotations source="positions.105" references="/0/getComments/arg0">
-      <details key="start" value="2820"/>
-      <details key="end" value="2834"/>
-      <details key="line" value="56"/>
-    </eAnnotations>
-    <eAnnotations source="positions.106" references="/0/getComments/%">
-      <details key="start" value="2848"/>
-      <details key="end" value="2960"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.107" references="/0/getComments/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.108" references="/0/getComments/%/%">
-      <details key="start" value="2855"/>
-      <details key="end" value="2898"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.109" references="/0/getComments/%/%.1">
-      <details key="start" value="2900"/>
-      <details key="end" value="2943"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.110" references="/0/getComments/%/%.2">
-      <details key="start" value="2945"/>
-      <details key="end" value="2959"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.111" references="/0/getComments/%/%.2/%/arg0">
-      <details key="start" value="2954"/>
-      <details key="end" value="2958"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.112" references="/0/getUsedPackages">
-      <details key="start" value="2965"/>
-      <details key="end" value="3153"/>
-      <details key="line" value="60"/>
-    </eAnnotations>
-    <eAnnotations source="positions.113" references="/0/getUsedPackages/arg0">
-      <details key="start" value="2995"/>
-      <details key="end" value="3009"/>
-      <details key="line" value="60"/>
-    </eAnnotations>
-    <eAnnotations source="positions.114" references="/0/getUsedPackages/%">
-      <details key="start" value="3034"/>
-      <details key="end" value="3150"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.115" references="/0/getUsedPackages/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.116" references="/0/getUsedPackages/%/%">
-      <details key="start" value="3041"/>
-      <details key="end" value="3084"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.117" references="/0/getUsedPackages/%/%.1">
-      <details key="start" value="3086"/>
-      <details key="end" value="3133"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.118" references="/0/getUsedPackages/%/%.2">
-      <details key="start" value="3135"/>
-      <details key="end" value="3149"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.119" references="/0/getUsedPackages/%/%.2/%/arg0">
-      <details key="start" value="3144"/>
-      <details key="end" value="3148"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.120" references="/0/getUsedClassifiers">
-      <details key="start" value="3155"/>
-      <details key="end" value="3358"/>
-      <details key="line" value="64"/>
-    </eAnnotations>
-    <eAnnotations source="positions.121" references="/0/getUsedClassifiers/arg0">
-      <details key="start" value="3188"/>
-      <details key="end" value="3205"/>
-      <details key="line" value="64"/>
-    </eAnnotations>
-    <eAnnotations source="positions.122" references="/0/getUsedClassifiers/%">
-      <details key="start" value="3233"/>
-      <details key="end" value="3355"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.123" references="/0/getUsedClassifiers/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.124" references="/0/getUsedClassifiers/%/%">
-      <details key="start" value="3240"/>
-      <details key="end" value="3283"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.125" references="/0/getUsedClassifiers/%/%.1">
-      <details key="start" value="3285"/>
-      <details key="end" value="3338"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.126" references="/0/getUsedClassifiers/%/%.2">
-      <details key="start" value="3340"/>
-      <details key="end" value="3354"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.127" references="/0/getUsedClassifiers/%/%.2/%/arg0">
-      <details key="start" value="3349"/>
-      <details key="end" value="3353"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.128" references="/0/getFullPath">
-      <details key="start" value="3360"/>
-      <details key="end" value="3529"/>
-      <details key="line" value="68"/>
-    </eAnnotations>
-    <eAnnotations source="positions.129" references="/0/getFullPath/arg0">
-      <details key="start" value="3386"/>
-      <details key="end" value="3400"/>
-      <details key="line" value="68"/>
-    </eAnnotations>
-    <eAnnotations source="positions.130" references="/0/getFullPath/%">
-      <details key="start" value="3414"/>
-      <details key="end" value="3526"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.131" references="/0/getFullPath/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.132" references="/0/getFullPath/%/%">
-      <details key="start" value="3421"/>
-      <details key="end" value="3464"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.133" references="/0/getFullPath/%/%.1">
-      <details key="start" value="3466"/>
-      <details key="end" value="3509"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.134" references="/0/getFullPath/%/%.2">
-      <details key="start" value="3511"/>
-      <details key="end" value="3525"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.135" references="/0/getFullPath/%/%.2/%/arg0">
-      <details key="start" value="3520"/>
-      <details key="end" value="3524"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.136" references="/0/hasStereotype">
-      <details key="start" value="3531"/>
-      <details key="end" value="3744"/>
-      <details key="line" value="72"/>
-    </eAnnotations>
-    <eAnnotations source="positions.137" references="/0/hasStereotype/arg0">
-      <details key="start" value="3559"/>
-      <details key="end" value="3573"/>
-      <details key="line" value="72"/>
-    </eAnnotations>
-    <eAnnotations source="positions.138" references="/0/hasStereotype/arg1">
-      <details key="start" value="3575"/>
-      <details key="end" value="3588"/>
-      <details key="line" value="72"/>
-    </eAnnotations>
-    <eAnnotations source="positions.139" references="/0/hasStereotype/%">
-      <details key="start" value="3603"/>
-      <details key="end" value="3741"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.140" references="/0/hasStereotype/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.141" references="/0/hasStereotype/%/%">
-      <details key="start" value="3610"/>
-      <details key="end" value="3653"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.142" references="/0/hasStereotype/%/%.1">
-      <details key="start" value="3655"/>
-      <details key="end" value="3718"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.143" references="/0/hasStereotype/%/%.2">
-      <details key="start" value="3720"/>
-      <details key="end" value="3740"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.144" references="/0/hasStereotype/%/%.2/%/arg0">
-      <details key="start" value="3729"/>
-      <details key="end" value="3733"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.145" references="/0/hasStereotype/%/%.2/%.1/arg1">
-      <details key="start" value="3735"/>
-      <details key="end" value="3739"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.146" references="/0/%">
-      <details key="start" value="3746"/>
-      <details key="end" value="3934"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.147" references="/0/hasStereotype.1">
-      <details key="start" value="3935"/>
-      <details key="end" value="4173"/>
-      <details key="line" value="77"/>
-    </eAnnotations>
-    <eAnnotations source="positions.148" references="/0/hasStereotype.1/arg0">
-      <details key="start" value="3963"/>
-      <details key="end" value="3977"/>
-      <details key="line" value="77"/>
-    </eAnnotations>
-    <eAnnotations source="positions.149" references="/0/hasStereotype.1/definition">
-      <details key="start" value="3979"/>
-      <details key="end" value="3998"/>
-      <details key="line" value="77"/>
-    </eAnnotations>
-    <eAnnotations source="positions.150" references="/0/hasStereotype.1/%">
-      <details key="start" value="4013"/>
-      <details key="end" value="4170"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.151" references="/0/hasStereotype.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.152" references="/0/hasStereotype.1/%/%">
-      <details key="start" value="4020"/>
-      <details key="end" value="4063"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.153" references="/0/hasStereotype.1/%/%.1">
-      <details key="start" value="4065"/>
-      <details key="end" value="4141"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.154" references="/0/hasStereotype.1/%/%.2">
-      <details key="start" value="4143"/>
-      <details key="end" value="4169"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.155" references="/0/hasStereotype.1/%/%.2/%/arg0">
-      <details key="start" value="4152"/>
-      <details key="end" value="4156"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.156" references="/0/hasStereotype.1/%/%.2/%.1/definition">
-      <details key="start" value="4158"/>
-      <details key="end" value="4168"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.157" references="/0/hasStereotypeTree">
-      <details key="start" value="4175"/>
-      <details key="end" value="4420"/>
-      <details key="line" value="81"/>
-    </eAnnotations>
-    <eAnnotations source="positions.158" references="/0/hasStereotypeTree/arg0">
-      <details key="start" value="4207"/>
-      <details key="end" value="4221"/>
-      <details key="line" value="81"/>
-    </eAnnotations>
-    <eAnnotations source="positions.159" references="/0/hasStereotypeTree/definition">
-      <details key="start" value="4223"/>
-      <details key="end" value="4242"/>
-      <details key="line" value="81"/>
-    </eAnnotations>
-    <eAnnotations source="positions.160" references="/0/hasStereotypeTree/%">
-      <details key="start" value="4257"/>
-      <details key="end" value="4417"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.161" references="/0/hasStereotypeTree/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.162" references="/0/hasStereotypeTree/%/%">
-      <details key="start" value="4264"/>
-      <details key="end" value="4307"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.163" references="/0/hasStereotypeTree/%/%.1">
-      <details key="start" value="4309"/>
-      <details key="end" value="4388"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.164" references="/0/hasStereotypeTree/%/%.2">
-      <details key="start" value="4390"/>
-      <details key="end" value="4416"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.165" references="/0/hasStereotypeTree/%/%.2/%/arg0">
-      <details key="start" value="4399"/>
-      <details key="end" value="4403"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.166" references="/0/hasStereotypeTree/%/%.2/%.1/definition">
-      <details key="start" value="4405"/>
-      <details key="end" value="4415"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.167" references="/0/getApplication">
-      <details key="start" value="4422"/>
-      <details key="end" value="4649"/>
-      <details key="line" value="84"/>
-    </eAnnotations>
-    <eAnnotations source="positions.168" references="/0/getApplication/arg0">
-      <details key="start" value="4451"/>
-      <details key="end" value="4465"/>
-      <details key="line" value="84"/>
-    </eAnnotations>
-    <eAnnotations source="positions.169" references="/0/getApplication/arg1">
-      <details key="start" value="4467"/>
-      <details key="end" value="4480"/>
-      <details key="line" value="84"/>
-    </eAnnotations>
-    <eAnnotations source="positions.170" references="/0/getApplication/%">
-      <details key="start" value="4494"/>
-      <details key="end" value="4646"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.171" references="/0/getApplication/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.172" references="/0/getApplication/%/%">
-      <details key="start" value="4501"/>
-      <details key="end" value="4544"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.173" references="/0/getApplication/%/%.1">
-      <details key="start" value="4546"/>
-      <details key="end" value="4623"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.174" references="/0/getApplication/%/%.2">
-      <details key="start" value="4625"/>
-      <details key="end" value="4645"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.175" references="/0/getApplication/%/%.2/%/arg0">
-      <details key="start" value="4634"/>
-      <details key="end" value="4638"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.176" references="/0/getApplication/%/%.2/%.1/arg1">
-      <details key="start" value="4640"/>
-      <details key="end" value="4644"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.177" references="/0/getApplicationTree">
-      <details key="start" value="4651"/>
-      <details key="end" value="4886"/>
-      <details key="line" value="88"/>
-    </eAnnotations>
-    <eAnnotations source="positions.178" references="/0/getApplicationTree/arg0">
-      <details key="start" value="4684"/>
-      <details key="end" value="4698"/>
-      <details key="line" value="88"/>
-    </eAnnotations>
-    <eAnnotations source="positions.179" references="/0/getApplicationTree/arg1">
-      <details key="start" value="4700"/>
-      <details key="end" value="4713"/>
-      <details key="line" value="88"/>
-    </eAnnotations>
-    <eAnnotations source="positions.180" references="/0/getApplicationTree/%">
-      <details key="start" value="4727"/>
-      <details key="end" value="4883"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.181" references="/0/getApplicationTree/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.182" references="/0/getApplicationTree/%/%">
-      <details key="start" value="4734"/>
-      <details key="end" value="4777"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.183" references="/0/getApplicationTree/%/%.1">
-      <details key="start" value="4779"/>
-      <details key="end" value="4860"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.184" references="/0/getApplicationTree/%/%.2">
-      <details key="start" value="4862"/>
-      <details key="end" value="4882"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.185" references="/0/getApplicationTree/%/%.2/%/arg0">
-      <details key="start" value="4871"/>
-      <details key="end" value="4875"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.186" references="/0/getApplicationTree/%/%.2/%.1/arg1">
-      <details key="start" value="4877"/>
-      <details key="end" value="4881"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.187" references="/0/getBody">
-      <details key="start" value="4888"/>
-      <details key="end" value="5092"/>
-      <details key="line" value="92"/>
-    </eAnnotations>
-    <eAnnotations source="positions.188" references="/0/getBody/arg0">
-      <details key="start" value="4910"/>
-      <details key="end" value="4926"/>
-      <details key="line" value="92"/>
-    </eAnnotations>
-    <eAnnotations source="positions.189" references="/0/getBody/arg1">
-      <details key="start" value="4928"/>
-      <details key="end" value="4941"/>
-      <details key="line" value="92"/>
-    </eAnnotations>
-    <eAnnotations source="positions.190" references="/0/getBody/%">
-      <details key="start" value="4955"/>
-      <details key="end" value="5089"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.191" references="/0/getBody/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.192" references="/0/getBody/%/%">
-      <details key="start" value="4962"/>
-      <details key="end" value="5005"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.193" references="/0/getBody/%/%.1">
-      <details key="start" value="5007"/>
-      <details key="end" value="5066"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.194" references="/0/getBody/%/%.2">
-      <details key="start" value="5068"/>
-      <details key="end" value="5088"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.195" references="/0/getBody/%/%.2/%/arg0">
-      <details key="start" value="5077"/>
-      <details key="end" value="5081"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.196" references="/0/getBody/%/%.2/%.1/arg1">
-      <details key="start" value="5083"/>
-      <details key="end" value="5087"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.197" references="/0/getBodyFromOB">
-      <details key="start" value="5094"/>
-      <details key="end" value="5320"/>
-      <details key="line" value="96"/>
-    </eAnnotations>
-    <eAnnotations source="positions.198" references="/0/getBodyFromOB/arg0">
-      <details key="start" value="5122"/>
-      <details key="end" value="5143"/>
-      <details key="line" value="96"/>
-    </eAnnotations>
-    <eAnnotations source="positions.199" references="/0/getBodyFromOB/arg1">
-      <details key="start" value="5145"/>
-      <details key="end" value="5158"/>
-      <details key="line" value="96"/>
-    </eAnnotations>
-    <eAnnotations source="positions.200" references="/0/getBodyFromOB/%">
-      <details key="start" value="5172"/>
-      <details key="end" value="5317"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.201" references="/0/getBodyFromOB/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.202" references="/0/getBodyFromOB/%/%">
-      <details key="start" value="5179"/>
-      <details key="end" value="5222"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.203" references="/0/getBodyFromOB/%/%.1">
-      <details key="start" value="5224"/>
-      <details key="end" value="5294"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.204" references="/0/getBodyFromOB/%/%.2">
-      <details key="start" value="5296"/>
-      <details key="end" value="5316"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.205" references="/0/getBodyFromOB/%/%.2/%/arg0">
-      <details key="start" value="5305"/>
-      <details key="end" value="5309"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.206" references="/0/getBodyFromOB/%/%.2/%.1/arg1">
-      <details key="start" value="5311"/>
-      <details key="end" value="5315"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.207" references="/0/cleanCR">
-      <details key="start" value="5322"/>
-      <details key="end" value="5468"/>
-      <details key="line" value="100"/>
-    </eAnnotations>
-    <eAnnotations source="positions.208" references="/0/cleanCR/str">
-      <details key="start" value="5344"/>
-      <details key="end" value="5356"/>
-      <details key="line" value="100"/>
-    </eAnnotations>
-    <eAnnotations source="positions.209" references="/0/cleanCR/%">
-      <details key="start" value="5370"/>
-      <details key="end" value="5465"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.210" references="/0/cleanCR/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.211" references="/0/cleanCR/%/%">
-      <details key="start" value="5377"/>
-      <details key="end" value="5420"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.212" references="/0/cleanCR/%/%.1">
-      <details key="start" value="5422"/>
-      <details key="end" value="5449"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.213" references="/0/cleanCR/%/%.2">
-      <details key="start" value="5451"/>
-      <details key="end" value="5464"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.214" references="/0/cleanCR/%/%.2/%/str">
-      <details key="start" value="5460"/>
-      <details key="end" value="5463"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.215" references="/0/maskNull">
-      <details key="start" value="5470"/>
-      <details key="end" value="5618"/>
-      <details key="line" value="104"/>
-    </eAnnotations>
-    <eAnnotations source="positions.216" references="/0/maskNull/str">
-      <details key="start" value="5493"/>
-      <details key="end" value="5505"/>
-      <details key="line" value="104"/>
-    </eAnnotations>
-    <eAnnotations source="positions.217" references="/0/maskNull/%">
-      <details key="start" value="5519"/>
-      <details key="end" value="5615"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.218" references="/0/maskNull/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.219" references="/0/maskNull/%/%">
-      <details key="start" value="5526"/>
-      <details key="end" value="5569"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.220" references="/0/maskNull/%/%.1">
-      <details key="start" value="5571"/>
-      <details key="end" value="5599"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.221" references="/0/maskNull/%/%.2">
-      <details key="start" value="5601"/>
-      <details key="end" value="5614"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.222" references="/0/maskNull/%/%.2/%/str">
-      <details key="start" value="5610"/>
-      <details key="end" value="5613"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.223" references="/0/getRelativePath">
-      <details key="start" value="5620"/>
-      <details key="end" value="5865"/>
-      <details key="line" value="108"/>
-    </eAnnotations>
-    <eAnnotations source="positions.224" references="/0/getRelativePath/ne1">
-      <details key="start" value="5650"/>
-      <details key="end" value="5668"/>
-      <details key="line" value="108"/>
-    </eAnnotations>
-    <eAnnotations source="positions.225" references="/0/getRelativePath/ne2">
-      <details key="start" value="5670"/>
-      <details key="end" value="5688"/>
-      <details key="line" value="108"/>
-    </eAnnotations>
-    <eAnnotations source="positions.226" references="/0/getRelativePath/%">
-      <details key="start" value="5702"/>
-      <details key="end" value="5862"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.227" references="/0/getRelativePath/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.228" references="/0/getRelativePath/%/%">
-      <details key="start" value="5709"/>
-      <details key="end" value="5752"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.229" references="/0/getRelativePath/%/%.1">
-      <details key="start" value="5754"/>
-      <details key="end" value="5841"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.230" references="/0/getRelativePath/%/%.2">
-      <details key="start" value="5843"/>
-      <details key="end" value="5861"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.231" references="/0/getRelativePath/%/%.2/%/ne1">
-      <details key="start" value="5852"/>
-      <details key="end" value="5855"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.232" references="/0/getRelativePath/%/%.2/%.1/ne2">
-      <details key="start" value="5857"/>
-      <details key="end" value="5860"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.233" references="/0/returnResult">
-      <details key="start" value="5867"/>
-      <details key="end" value="6051"/>
-      <details key="line" value="112"/>
-    </eAnnotations>
-    <eAnnotations source="positions.234" references="/0/returnResult/behavior">
-      <details key="start" value="5894"/>
-      <details key="end" value="5913"/>
-      <details key="line" value="112"/>
-    </eAnnotations>
-    <eAnnotations source="positions.235" references="/0/returnResult/%">
-      <details key="start" value="5930"/>
-      <details key="end" value="6048"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.236" references="/0/returnResult/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.237" references="/0/returnResult/%/%">
-      <details key="start" value="5937"/>
-      <details key="end" value="5980"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.238" references="/0/returnResult/%/%.1">
-      <details key="start" value="5982"/>
-      <details key="end" value="6027"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.239" references="/0/returnResult/%/%.2">
-      <details key="start" value="6029"/>
-      <details key="end" value="6047"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.240" references="/0/returnResult/%/%.2/%/behavior">
-      <details key="start" value="6038"/>
-      <details key="end" value="6046"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.mtl b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.mtl
deleted file mode 100644
index 2506153a545..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.mtl
+++ /dev/null
@@ -1,114 +0,0 @@
-[comment encoding = UTF-8 /]
-[module GenUtils('http://www.eclipse.org/uml2/5.0.0/UML')/]
-
-[query public getTemplateBindings(arg0 : Class) : TemplateBinding
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getTemplateBindings(org.eclipse.uml2.uml.Class)', Sequence{arg0})
-/]
-
-[query public isTemplateBoundElement(arg0 : Classifier) : Boolean
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'isTemplateBoundElement(org.eclipse.uml2.uml.Classifier)', Sequence{arg0})
-/]
-
-[query public getTemplateName(arg0 : TemplateParameter) : String
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getTemplateName(org.eclipse.uml2.uml.TemplateParameter)', Sequence{arg0})
-/]
-
-[query public getTemplateParameters(arg0 : Classifier) : Collection(TemplateParameter)
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getTemplateParameters(org.eclipse.uml2.uml.Classifier)', Sequence{arg0})
-/]
-
-[query public getTemplateParameteredElements(arg0 : Classifier) : Collection(Classifier)
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getTemplateParameteredElements(org.eclipse.uml2.uml.Classifier)', Sequence{arg0})
-/]
-
-[query public getOwnedAttributeTypes(arg0 : Classifier) : Sequence(Classifier)
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getOwnedAttributeTypes(org.eclipse.uml2.uml.Classifier)', Sequence{arg0})
-/]
-
-[query public getTypesViaAttributes(arg0 : Classifier) : Sequence(Classifier)
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getTypesViaAttributes(org.eclipse.uml2.uml.Classifier)', Sequence{arg0})
-/]
-
-[query public getTypesViaOperations(arg0 : Classifier) : Sequence(Classifier)
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getTypesViaOperations(org.eclipse.uml2.uml.Classifier)', Sequence{arg0})
-/]
-
-[query public getTypesViaRelationships(arg0 : Classifier) : Sequence(Classifier)
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getTypesViaRelationships(org.eclipse.uml2.uml.Classifier)', Sequence{arg0})
-/]
-
-[query public getTypesViaDependencies(arg0 : Classifier) : Sequence(Classifier)
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getTypesViaDependencies(org.eclipse.uml2.uml.Classifier)', Sequence{arg0})
-/]
-
-[query public getTypesViaRelationshipsNoDeps(arg0 : Classifier) : Sequence(Classifier)
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getTypesViaRelationshipsNoDeps(org.eclipse.uml2.uml.Classifier)', Sequence{arg0})
-/]
-
-[query public getFullName(arg0 : NamedElement) : String
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getFullName(org.eclipse.uml2.uml.NamedElement)', Sequence{arg0})
-/]
-
-[query public getFullNameUC(arg0 : NamedElement) : String
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getFullNameUC(org.eclipse.uml2.uml.NamedElement)', Sequence{arg0})
-/]
-
-[query public getComments(arg0 : Element) : String
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getComments(org.eclipse.uml2.uml.Element)', Sequence{arg0})
-/]
-
-[query public getUsedPackages(arg0 : Package) : Sequence(Package)
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getUsedPackages(org.eclipse.uml2.uml.Package)', Sequence{arg0})
-/]
-
-[query public getUsedClassifiers(arg0 : Classifier) : Sequence(Classifier)
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getUsedClassifiers(org.eclipse.uml2.uml.Classifier)', Sequence{arg0})
-/]
-
-[query public getFullPath(arg0 : Package) : String
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getFullPath(org.eclipse.uml2.uml.Package)', Sequence{arg0})
-/]
-
-[query public hasStereotype(arg0 : Element, arg1 : String) : Boolean
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'hasStereotype(org.eclipse.uml2.uml.Element, java.lang.String)', Sequence{arg0, arg1})
-/]
-
-[comment use OclAny instead of EClass, since Acceleo does not consider a passed stereotype (such as C_Cpp::Ptr) as EClass compatible - although the passed value is technically an eclass /]
-[query public hasStereotype(arg0 : Element, definition : OclAny) : Boolean
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'hasStereotypeA(org.eclipse.uml2.uml.Element, org.eclipse.emf.ecore.EClass)', Sequence{arg0, definition})
-/]
-
-[query public hasStereotypeTree(arg0 : Element, definition : OclAny) : Boolean
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'hasStereotypeTree(org.eclipse.uml2.uml.Element, org.eclipse.emf.ecore.EClass)', Sequence{arg0, definition}) /]
-
-[query public getApplication(arg0 : Element, arg1 : OclAny) : OclAny
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getApplicationA(org.eclipse.uml2.uml.Element, org.eclipse.emf.ecore.EClass)', Sequence{arg0, arg1})
-/]
-
-[query public getApplicationTree(arg0 : Element, arg1 : OclAny) : OclAny
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getApplicationTreeA(org.eclipse.uml2.uml.Element, org.eclipse.emf.ecore.EClass)', Sequence{arg0, arg1})
-/]
-
-[query public getBody(arg0 : Operation, arg1 : String) : String
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getBody(org.eclipse.uml2.uml.Operation, java.lang.String)', Sequence{arg0, arg1})
-/]
-
-[query public getBodyFromOB(arg0 : OpaqueBehavior, arg1 : String) : String
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getBodyFromOB(org.eclipse.uml2.uml.OpaqueBehavior, java.lang.String)', Sequence{arg0, arg1})
-/]
-
-[query public cleanCR(str : String) : String
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'cleanCR(java.lang.String)', Sequence{str})
-/]
-
-[query public maskNull(str : String) : String
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'maskNull(java.lang.String)', Sequence{str})
-/]
-
-[query public getRelativePath(ne1 : NamedElement, ne2 : NamedElement) : String
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'getRelativePath(org.eclipse.uml2.uml.NamedElement, org.eclipse.uml2.uml.NamedElement)', Sequence{ne1, ne2})
-/]
-
-[query public returnResult(behavior : Behavior) : Parameter
-	= invoke('org.eclipse.papyrus.codegen.base.GenUtils', 'returnResult(org.eclipse.uml2.uml.Behavior)', Sequence{behavior})
-/]
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Utils.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Utils.java
deleted file mode 100644
index c8f7a01c102..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Utils.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.papyrus.acceleo;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-
-public class Utils {
-
-	/**
-	 * Return the absolute file name to a file name given e.g. in the form platform:/plugin/xxx
-	 *
-	 * @param fileName
-	 *            the file name using eclipse elements such as platform:/plugin
-	 * @return the absolute file name
-	 */
-	public static String getAbsoluteFN(String fileName) {
-		try {
-			URL absoluteURL = FileLocator.toFileURL(new URL(fileName));
-			return absoluteURL.getFile();
-		} catch (MalformedURLException e) {
-		} catch (IOException e) {
-		}
-		return null;
-	}
-}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/icons/codegen-16x16.gif b/extraplugins/codegen/org.eclipse.papyrus.codegen.base/icons/codegen-16x16.gif
deleted file mode 100644
index d7c1a7365f5..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/icons/codegen-16x16.gif
+++ /dev/null
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.emtl
deleted file mode 100644
index 967aca987ef..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.emtl
+++ /dev/null
@@ -1,993 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppGenUtils" nsURI="org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils" startHeaderPosition="29" endHeaderPosition="89">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <ownedModuleElement xsi:type="mtl:Query" name="getTemplateParametersWoType" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTemplateParametersWoType(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getTemplateParametersWoType/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getStdtypes" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getStdtypes(org.eclipse.uml2.uml.PrimitiveType)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(PrimitiveType)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getStdtypes/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="cppQualifiedName" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="cppQualifiedName(org.eclipse.uml2.uml.NamedElement)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(NamedElement)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/cppQualifiedName/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getTemplateTypeName" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTemplateTypeName(org.eclipse.uml2.uml.TemplateParameter)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(TemplateParameter)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getTemplateTypeName/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getNamespace" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getNamespace(org.eclipse.uml2.uml.NamedElement)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(NamedElement)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getNamespace/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="openNS" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/20">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="openNS(org.eclipse.uml2.uml.NamedElement)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(NamedElement)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/openNS/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="closeNS" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="closeNS(org.eclipse.uml2.uml.NamedElement)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(NamedElement)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/closeNS/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getGeneralizationVisibility" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/26">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getGeneralizationVisibility(org.eclipse.uml2.uml.Element)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(Element)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getGeneralizationVisibility/arg0">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="resetVisibility" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/29">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="resetVisibility(org.eclipse.uml2.uml.VisibilityKind)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(VisibilityKind)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/resetVisibility/arg0">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getSection" visibility="Public">
-      <parameter name="arg0">
-        <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </parameter>
-      <parameter name="arg1">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getSection(org.eclipse.uml2.uml.VisibilityKind, java.lang.String)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(OclAny)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/getSection/arg0">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            </item>
-          </part>
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="arg1" referredVariable="/0/getSection/arg1">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="getTemplateParametersWoType">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getTemplateParametersWoType"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getStdtypes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getStdtypes"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppQualifiedName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/cppQualifiedName"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTemplateTypeName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getTemplateTypeName"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getNamespace">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getNamespace"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="openNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/openNS"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="closeNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/closeNS"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getGeneralizationVisibility">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getGeneralizationVisibility"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="resetVisibility">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/resetVisibility"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getSection">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getSection"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-      <eOperations name="invoke">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="class">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="method">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="arguments">
-          <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Classifier)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(PrimitiveType)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(NamedElement)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(TemplateParameter)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Element)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(VisibilityKind)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/getTemplateParametersWoType">
-      <details key="start" value="93"/>
-      <details key="end" value="308"/>
-      <details key="line" value="4"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/getTemplateParametersWoType/arg0">
-      <details key="start" value="135"/>
-      <details key="end" value="152"/>
-      <details key="line" value="4"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/getTemplateParametersWoType/%">
-      <details key="start" value="166"/>
-      <details key="end" value="305"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/getTemplateParametersWoType/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/getTemplateParametersWoType/%/%">
-      <details key="start" value="173"/>
-      <details key="end" value="224"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/getTemplateParametersWoType/%/%.1">
-      <details key="start" value="226"/>
-      <details key="end" value="288"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/getTemplateParametersWoType/%/%.2">
-      <details key="start" value="290"/>
-      <details key="end" value="304"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/getTemplateParametersWoType/%/%.2/%/arg0">
-      <details key="start" value="299"/>
-      <details key="end" value="303"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/getStdtypes">
-      <details key="start" value="310"/>
-      <details key="end" value="499"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/getStdtypes/arg0">
-      <details key="start" value="336"/>
-      <details key="end" value="356"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/getStdtypes/%">
-      <details key="start" value="370"/>
-      <details key="end" value="496"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/getStdtypes/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/getStdtypes/%/%">
-      <details key="start" value="377"/>
-      <details key="end" value="428"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/getStdtypes/%/%.1">
-      <details key="start" value="430"/>
-      <details key="end" value="479"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/getStdtypes/%/%.2">
-      <details key="start" value="481"/>
-      <details key="end" value="495"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/getStdtypes/%/%.2/%/arg0">
-      <details key="start" value="490"/>
-      <details key="end" value="494"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/cppQualifiedName">
-      <details key="start" value="501"/>
-      <details key="end" value="698"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/cppQualifiedName/arg0">
-      <details key="start" value="532"/>
-      <details key="end" value="551"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/cppQualifiedName/%">
-      <details key="start" value="565"/>
-      <details key="end" value="695"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/cppQualifiedName/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/cppQualifiedName/%/%">
-      <details key="start" value="572"/>
-      <details key="end" value="623"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/cppQualifiedName/%/%.1">
-      <details key="start" value="625"/>
-      <details key="end" value="678"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/cppQualifiedName/%/%.2">
-      <details key="start" value="680"/>
-      <details key="end" value="694"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/cppQualifiedName/%/%.2/%/arg0">
-      <details key="start" value="689"/>
-      <details key="end" value="693"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/getTemplateTypeName">
-      <details key="start" value="700"/>
-      <details key="end" value="913"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/getTemplateTypeName/arg0">
-      <details key="start" value="734"/>
-      <details key="end" value="758"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/getTemplateTypeName/%">
-      <details key="start" value="772"/>
-      <details key="end" value="910"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/getTemplateTypeName/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/getTemplateTypeName/%/%">
-      <details key="start" value="779"/>
-      <details key="end" value="830"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/getTemplateTypeName/%/%.1">
-      <details key="start" value="832"/>
-      <details key="end" value="893"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/getTemplateTypeName/%/%.2">
-      <details key="start" value="895"/>
-      <details key="end" value="909"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/getTemplateTypeName/%/%.2/%/arg0">
-      <details key="start" value="904"/>
-      <details key="end" value="908"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/getNamespace">
-      <details key="start" value="915"/>
-      <details key="end" value="1104"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/getNamespace/arg0">
-      <details key="start" value="942"/>
-      <details key="end" value="961"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/getNamespace/%">
-      <details key="start" value="975"/>
-      <details key="end" value="1101"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/getNamespace/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/getNamespace/%/%">
-      <details key="start" value="982"/>
-      <details key="end" value="1033"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/getNamespace/%/%.1">
-      <details key="start" value="1035"/>
-      <details key="end" value="1084"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/getNamespace/%/%.2">
-      <details key="start" value="1086"/>
-      <details key="end" value="1100"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/getNamespace/%/%.2/%/arg0">
-      <details key="start" value="1095"/>
-      <details key="end" value="1099"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/openNS">
-      <details key="start" value="1106"/>
-      <details key="end" value="1283"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/openNS/arg0">
-      <details key="start" value="1127"/>
-      <details key="end" value="1146"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/openNS/%">
-      <details key="start" value="1160"/>
-      <details key="end" value="1280"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/openNS/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/openNS/%/%">
-      <details key="start" value="1167"/>
-      <details key="end" value="1218"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/openNS/%/%.1">
-      <details key="start" value="1220"/>
-      <details key="end" value="1263"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/openNS/%/%.2">
-      <details key="start" value="1265"/>
-      <details key="end" value="1279"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/openNS/%/%.2/%/arg0">
-      <details key="start" value="1274"/>
-      <details key="end" value="1278"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/closeNS">
-      <details key="start" value="1285"/>
-      <details key="end" value="1464"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/closeNS/arg0">
-      <details key="start" value="1307"/>
-      <details key="end" value="1326"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/closeNS/%">
-      <details key="start" value="1340"/>
-      <details key="end" value="1461"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/closeNS/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/closeNS/%/%">
-      <details key="start" value="1347"/>
-      <details key="end" value="1398"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/closeNS/%/%.1">
-      <details key="start" value="1400"/>
-      <details key="end" value="1444"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/closeNS/%/%.2">
-      <details key="start" value="1446"/>
-      <details key="end" value="1460"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/closeNS/%/%.2/%/arg0">
-      <details key="start" value="1455"/>
-      <details key="end" value="1459"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/getGeneralizationVisibility">
-      <details key="start" value="1466"/>
-      <details key="end" value="1675"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/getGeneralizationVisibility/arg0">
-      <details key="start" value="1508"/>
-      <details key="end" value="1522"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/getGeneralizationVisibility/%">
-      <details key="start" value="1536"/>
-      <details key="end" value="1672"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/getGeneralizationVisibility/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/getGeneralizationVisibility/%/%">
-      <details key="start" value="1543"/>
-      <details key="end" value="1594"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/getGeneralizationVisibility/%/%.1">
-      <details key="start" value="1596"/>
-      <details key="end" value="1655"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/getGeneralizationVisibility/%/%.2">
-      <details key="start" value="1657"/>
-      <details key="end" value="1671"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/getGeneralizationVisibility/%/%.2/%/arg0">
-      <details key="start" value="1666"/>
-      <details key="end" value="1670"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/resetVisibility">
-      <details key="start" value="1677"/>
-      <details key="end" value="1879"/>
-      <details key="line" value="36"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/resetVisibility/arg0">
-      <details key="start" value="1707"/>
-      <details key="end" value="1728"/>
-      <details key="line" value="36"/>
-    </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/resetVisibility/%">
-      <details key="start" value="1745"/>
-      <details key="end" value="1876"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/resetVisibility/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/resetVisibility/%/%">
-      <details key="start" value="1752"/>
-      <details key="end" value="1803"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/resetVisibility/%/%.1">
-      <details key="start" value="1805"/>
-      <details key="end" value="1859"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/resetVisibility/%/%.2">
-      <details key="start" value="1861"/>
-      <details key="end" value="1875"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/resetVisibility/%/%.2/%/arg0">
-      <details key="start" value="1870"/>
-      <details key="end" value="1874"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/getSection">
-      <details key="start" value="1881"/>
-      <details key="end" value="2112"/>
-      <details key="line" value="40"/>
-    </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/getSection/arg0">
-      <details key="start" value="1906"/>
-      <details key="end" value="1927"/>
-      <details key="line" value="40"/>
-    </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/getSection/arg1">
-      <details key="start" value="1929"/>
-      <details key="end" value="1942"/>
-      <details key="line" value="40"/>
-    </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/getSection/%">
-      <details key="start" value="1959"/>
-      <details key="end" value="2109"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/getSection/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/getSection/%/%">
-      <details key="start" value="1966"/>
-      <details key="end" value="2017"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/getSection/%/%.1">
-      <details key="start" value="2019"/>
-      <details key="end" value="2086"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.79" references="/0/getSection/%/%.2">
-      <details key="start" value="2088"/>
-      <details key="end" value="2108"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.80" references="/0/getSection/%/%.2/%/arg0">
-      <details key="start" value="2097"/>
-      <details key="end" value="2101"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.81" references="/0/getSection/%/%.2/%.1/arg1">
-      <details key="start" value="2103"/>
-      <details key="end" value="2107"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.mtl
deleted file mode 100644
index 973b888613e..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.mtl
+++ /dev/null
@@ -1,42 +0,0 @@
-[comment encoding = UTF-8 /]
-[module CppGenUtils('http://www.eclipse.org/uml2/5.0.0/UML')/]
-
-[query public getTemplateParametersWoType(arg0 : Classifier) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils', 'getTemplateParametersWoType(org.eclipse.uml2.uml.Classifier)', Sequence{arg0})
-/]
-
-[query public getStdtypes(arg0 : PrimitiveType) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils', 'getStdtypes(org.eclipse.uml2.uml.PrimitiveType)', Sequence{arg0})
-/]
-
-[query public cppQualifiedName(arg0 : NamedElement) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils', 'cppQualifiedName(org.eclipse.uml2.uml.NamedElement)', Sequence{arg0})
-/]
-
-[query public getTemplateTypeName(arg0 : TemplateParameter) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils', 'getTemplateTypeName(org.eclipse.uml2.uml.TemplateParameter)', Sequence{arg0})
-/]
-
-[query public getNamespace(arg0 : NamedElement) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils', 'getNamespace(org.eclipse.uml2.uml.NamedElement)', Sequence{arg0})
-/]
-
-[query public openNS(arg0 : NamedElement) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils', 'openNS(org.eclipse.uml2.uml.NamedElement)', Sequence{arg0})
-/]
-
-[query public closeNS(arg0 : NamedElement) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils', 'closeNS(org.eclipse.uml2.uml.NamedElement)', Sequence{arg0})
-/]
-
-[query public getGeneralizationVisibility(arg0 : Element) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils', 'getGeneralizationVisibility(org.eclipse.uml2.uml.Element)', Sequence{arg0})
-/]
-
-[query public resetVisibility(arg0 : VisibilityKind) : String
-    = invoke('org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils', 'resetVisibility(org.eclipse.uml2.uml.VisibilityKind)', Sequence{arg0})
-/]
-
-[query public getSection(arg0 : VisibilityKind, arg1 : String) : String
-    = invoke('org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils', 'getSection(org.eclipse.uml2.uml.VisibilityKind, java.lang.String)', Sequence{arg0, arg1})
-/]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl
deleted file mode 100644
index 144d24288d2..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="Modifier" nsURI="org::eclipse::papyrus::cpp::codegen::utils::Modifier" startHeaderPosition="29" endHeaderPosition="86">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <ownedModuleElement xsi:type="mtl:Query" name="modPtr" visibility="Public">
-      <parameter name="propertyOrParameter">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.Modifier">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="modPtr(org.eclipse.uml2.uml.Element)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(Element)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="propertyOrParameter" referredVariable="/0/modPtr/propertyOrParameter">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="modRef" visibility="Public">
-      <parameter name="propertyOrParameter">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.Modifier">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="modRef(org.eclipse.uml2.uml.Element)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(Element)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="propertyOrParameter" referredVariable="/0/modRef/propertyOrParameter">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="modArray" visibility="Public">
-      <parameter name="propertyOrParameter">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.Modifier">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="modArray(org.eclipse.uml2.uml.Element)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(Element)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="propertyOrParameter" referredVariable="/0/modArray/propertyOrParameter">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="modCVQualifier" visibility="Public">
-      <parameter name="propertyOrParameter">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.Modifier">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="modCVQualifier(org.eclipse.uml2.uml.Element)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(Element)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="propertyOrParameter" referredVariable="/0/modCVQualifier/propertyOrParameter">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="modPtr">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/modPtr"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modRef">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/modRef"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modArray">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/modArray"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modCVQualifier">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/modCVQualifier"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-      <eOperations name="invoke">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="class">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="method">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="arguments">
-          <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Element)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/modPtr">
-      <details key="start" value="90"/>
-      <details key="end" value="284"/>
-      <details key="line" value="4"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/modPtr/propertyOrParameter">
-      <details key="start" value="111"/>
-      <details key="end" value="140"/>
-      <details key="line" value="4"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/modPtr/%">
-      <details key="start" value="154"/>
-      <details key="end" value="281"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/modPtr/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/modPtr/%/%">
-      <details key="start" value="161"/>
-      <details key="end" value="209"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/modPtr/%/%.1">
-      <details key="start" value="211"/>
-      <details key="end" value="249"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/modPtr/%/%.2">
-      <details key="start" value="251"/>
-      <details key="end" value="280"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/modPtr/%/%.2/%/propertyOrParameter">
-      <details key="start" value="260"/>
-      <details key="end" value="279"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/modRef">
-      <details key="start" value="286"/>
-      <details key="end" value="480"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/modRef/propertyOrParameter">
-      <details key="start" value="307"/>
-      <details key="end" value="336"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/modRef/%">
-      <details key="start" value="350"/>
-      <details key="end" value="477"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/modRef/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/modRef/%/%">
-      <details key="start" value="357"/>
-      <details key="end" value="405"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/modRef/%/%.1">
-      <details key="start" value="407"/>
-      <details key="end" value="445"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/modRef/%/%.2">
-      <details key="start" value="447"/>
-      <details key="end" value="476"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/modRef/%/%.2/%/propertyOrParameter">
-      <details key="start" value="456"/>
-      <details key="end" value="475"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/modArray">
-      <details key="start" value="482"/>
-      <details key="end" value="680"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/modArray/propertyOrParameter">
-      <details key="start" value="505"/>
-      <details key="end" value="534"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/modArray/%">
-      <details key="start" value="548"/>
-      <details key="end" value="677"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/modArray/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/modArray/%/%">
-      <details key="start" value="555"/>
-      <details key="end" value="603"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/modArray/%/%.1">
-      <details key="start" value="605"/>
-      <details key="end" value="645"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/modArray/%/%.2">
-      <details key="start" value="647"/>
-      <details key="end" value="676"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/modArray/%/%.2/%/propertyOrParameter">
-      <details key="start" value="656"/>
-      <details key="end" value="675"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/modCVQualifier">
-      <details key="start" value="682"/>
-      <details key="end" value="892"/>
-      <details key="line" value="13"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/modCVQualifier/propertyOrParameter">
-      <details key="start" value="711"/>
-      <details key="end" value="740"/>
-      <details key="line" value="13"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/modCVQualifier/%">
-      <details key="start" value="754"/>
-      <details key="end" value="889"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/modCVQualifier/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/modCVQualifier/%/%">
-      <details key="start" value="761"/>
-      <details key="end" value="809"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/modCVQualifier/%/%.1">
-      <details key="start" value="811"/>
-      <details key="end" value="857"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/modCVQualifier/%/%.2">
-      <details key="start" value="859"/>
-      <details key="end" value="888"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/modCVQualifier/%/%.2/%/propertyOrParameter">
-      <details key="start" value="868"/>
-      <details key="end" value="887"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl
deleted file mode 100644
index 08166221277..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl
+++ /dev/null
@@ -1,15 +0,0 @@
-[comment encoding = UTF-8 /]
-[module Modifier('http://www.eclipse.org/uml2/5.0.0/UML')/]
-
-[query public modPtr(propertyOrParameter : Element) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.Modifier', 'modPtr(org.eclipse.uml2.uml.Element)', Sequence{propertyOrParameter}) /]
-
-[query public modRef(propertyOrParameter : Element) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.Modifier', 'modRef(org.eclipse.uml2.uml.Element)', Sequence{propertyOrParameter}) /]
-
-[query public modArray(propertyOrParameter : Element) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.Modifier', 'modArray(org.eclipse.uml2.uml.Element)', Sequence{propertyOrParameter}) /]
-
-[query public modCVQualifier(propertyOrParameter : Element) : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.Modifier', 'modCVQualifier(org.eclipse.uml2.uml.Element)', Sequence{propertyOrParameter}) /]
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/StdStereo.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/StdStereo.java
deleted file mode 100644
index 315c1f0fbe3..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/StdStereo.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 - 2012 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
- *******************************************************************************/
-
-package org.eclipse.papyrus.cpp.profile;
-
-public class StdStereo {
-	// CAVEAT: namespace has changed from Standard to StandardProfileL2 (and might change back again)
-	public final static String create = "StandardProfileL2::Create"; //$NON-NLS-1$
-	public final static String destroy = "StandardProfileL2::Destroy"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/allocation.gif b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/allocation.gif
deleted file mode 100644
index ced634f9c9c..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/allocation.gif
+++ /dev/null
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/deploy.gif b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/deploy.gif
deleted file mode 100644
index 7a7ced35f3d..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/deploy.gif
+++ /dev/null
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/build.acceleo b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/build.acceleo
deleted file mode 100644
index fb14dcfe540..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/build.acceleo
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- ===================================================================== -->
-<!-- Custom targets.                                                       -->
-<!-- Set customBuildCallbacks = build.acceleo in your build.properties.    -->
-<!-- ===================================================================== -->
-<project name="Build Acceleo Module" default="noDefault">    
-    <!-- ================================================================= -->
-    <!-- Default target                                                    -->
-    <!-- ================================================================= -->
-    <target name="noDefault">
-        <echo message="This file must be called with explicit targets" />
-    </target>
-
-    <!-- ================================================================= -->
-    <!-- This will be called automatically after the compilation of each   -->
-    <!-- Bundle... in dependency order.                                    -->
-    <!-- ================================================================= -->
-    <target name="post.compile.@dot">
-        <acceleoCompiler 
-            sourceFolder="${target.folder}"
-            outputFolder="${target.folder}"
-            dependencies=""
-            binaryResource="false"
-            packagesToRegister="">
-        </acceleoCompiler>
-    </target>    
-</project>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.cpp b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.cpp
deleted file mode 100644
index 3438bbb0d30..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#define HelloWorld_components_HelloWorld_BODY
-
-/************************************************************
- HelloWorld class body
- ************************************************************/
-
-// include associated header file
-#include <HelloWorld/components/HelloWorld.h>
-
-// Derived includes directives
-#include <sysinterfaces/IStart.h>
-
-namespace components {
-
-// static attributes (if any)
-
-/**
- * 
- * 
- */
-void HelloWorld::run() {
-	cout << "Hello world: " << message << endl;
-}
-
-} // of namespace components
-
-/************************************************************
- End of HelloWorld class body
- ************************************************************/
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.h b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.h
deleted file mode 100644
index de7e6e07050..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#ifndef HELLOWORLD_COMPONENTS_HELLOWORLD_H
-#define HELLOWORLD_COMPONENTS_HELLOWORLD_H
-
-/************************************************************
- HelloWorld class header
- ************************************************************/
-
-/* Owner package header include                             */
-#include <HelloWorld/components/Pkg_components.h>
-
-/* Owner package header include                             */
-#include <PrimitiveTypes/Pkg_PrimitiveTypes.h>
-
-#include <sysinterfaces/IStart.h>
-
-#include <core/StdPorts/Cstart.h>
-
-namespace components {
-
-/************************************************************/
-/**
- * Configuration attribute within the Hello World component. Its value is configured on the instance level.
- */
-
-class HelloWorld: public ::StdPorts::Cstart, public IStart {
-
-public:
-
-	/**
-	 * 
-	 */
-	String message;
-
-	/**
-	 * 
-	 * 
-	 */
-	void run();
-
-};
-/************************************************************/
-/* External declarations (package visibility)               */
-
-/************************************************************/
-
-/* Inline functions                                         */
-
-} // of namespace components
-
-/************************************************************
- End of HelloWorld class header
- ************************************************************/
-
-#endif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.cpp b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.cpp
deleted file mode 100644
index 487d89a2cde..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#define HelloWorld_platform_MonoNode_BODY
-
-/************************************************************
- MonoNode class body
- ************************************************************/
-
-// include associated header file
-#include <HelloWorld/platform/MonoNode.h>
-
-// Derived includes directives
-
-namespace platform {
-
-// static attributes (if any)
-
-}// of namespace platform
-
-/************************************************************
- End of MonoNode class body
- ************************************************************/
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.h b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.h
deleted file mode 100644
index 11ec7186c39..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#ifndef HELLOWORLD_PLATFORM_MONONODE_H
-#define HELLOWORLD_PLATFORM_MONONODE_H
-
-/************************************************************
- MonoNode class header
- ************************************************************/
-
-/* Owner package header include                             */
-#include <HelloWorld/platform/Pkg_platform.h>
-
-namespace platform {
-
-/************************************************************/
-/**
- * 
- */
-
-class MonoNode {
-
-};
-/************************************************************/
-/* External declarations (package visibility)               */
-
-/************************************************************/
-
-/* Inline functions                                         */
-
-} // of namespace platform
-
-/************************************************************
- End of MonoNode class header
- ************************************************************/
-
-#endif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.di b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.di
deleted file mode 100644
index a60df8b7c45..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.di
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:history="http://www.eclipse.org/papyrus/0.7.0/controlmode">
-  <di:SashWindowsMngr>
-    <pageList>
-      <availablePage>
-        <emfPageIdentifier href="ClientServerTimer.notation#_XSHWMF36Ed-UvNEDwY5GNg"/>
-      </availablePage>
-      <availablePage>
-        <emfPageIdentifier href="ClientServerTimer.notation#_wOG5sF36Ed-UvNEDwY5GNg"/>
-      </availablePage>
-      <availablePage>
-        <emfPageIdentifier href="ClientServerTimer.notation#_aeSh0F37Ed-UvNEDwY5GNg"/>
-      </availablePage>
-      <availablePage>
-        <emfPageIdentifier href="ClientServerTimer.notation#_q-Wa0F37Ed-UvNEDwY5GNg"/>
-      </availablePage>
-      <availablePage>
-        <emfPageIdentifier href="ClientServerTimer.notation#_6FvnwGONEd-seu3qyZgHfg"/>
-      </availablePage>
-      <availablePage>
-        <emfPageIdentifier href="ClientServerTimer.notation#_KYrjcKxkEeCgusK7cm6qjQ"/>
-      </availablePage>
-      <availablePage>
-        <emfPageIdentifier href="ClientServerTimer.notation#_HoscYMniEeCMCo5Ox2CNmg"/>
-      </availablePage>
-    </pageList>
-    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
-      <windows>
-        <children xsi:type="di:TabFolder">
-          <children>
-            <emfPageIdentifier href="ClientServerTimer.notation#_XSHWMF36Ed-UvNEDwY5GNg"/>
-          </children>
-          <children>
-            <emfPageIdentifier href="ClientServerTimer.notation#_wOG5sF36Ed-UvNEDwY5GNg"/>
-          </children>
-          <children>
-            <emfPageIdentifier href="ClientServerTimer.notation#_aeSh0F37Ed-UvNEDwY5GNg"/>
-          </children>
-          <children>
-            <emfPageIdentifier href="ClientServerTimer.notation#_q-Wa0F37Ed-UvNEDwY5GNg"/>
-          </children>
-          <children>
-            <emfPageIdentifier href="ClientServerTimer.notation#_6FvnwGONEd-seu3qyZgHfg"/>
-          </children>
-          <children>
-            <emfPageIdentifier href="ClientServerTimer.notation#_HoscYMniEeCMCo5Ox2CNmg"/>
-          </children>
-        </children>
-      </windows>
-    </sashModel>
-  </di:SashWindowsMngr>
-  <history:ControledResource/>
-  <history:ControledResource/>
-  <history:ControledResource/>
-  <history:ControledResource/>
-  <history:ControledResource/>
-  <history:ControledResource/>
-  <history:ControledResource/>
-</xmi:XMI>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.di b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.di
deleted file mode 100644
index 1ea0f4f343e..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.di
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmi:id="_M_WAwPcXEd-KM6l7lmIPkw">
-  <pageList xmi:id="_M_WAwfcXEd-KM6l7lmIPkw">
-    <availablePage xmi:id="_M_WAwvcXEd-KM6l7lmIPkw"/>
-    <availablePage xmi:id="_M_WAxPcXEd-KM6l7lmIPkw">
-      <emfPageIdentifier href="HelloWorld.notation#_7kc7YM__Ed-TP80eVS-2Rg"/>
-    </availablePage>
-    <availablePage xmi:id="_M_WAxfcXEd-KM6l7lmIPkw">
-      <emfPageIdentifier href="HelloWorld.notation#_o6ZisNCREd-hqYHBJe17_Q"/>
-    </availablePage>
-    <availablePage xmi:id="_U1docPcXEd-KM6l7lmIPkw">
-      <emfPageIdentifier href="HelloWorld.notation#_U1UegPcXEd-KM6l7lmIPkw"/>
-    </availablePage>
-    <availablePage xmi:id="_V5fVYP8nEd-hWJO6cv3VJA"/>
-    <availablePage>
-      <emfPageIdentifier href="HelloWorld.notation#_0rwpYDefEeGPyrZ5I3hMlA"/>
-    </availablePage>
-    <availablePage>
-      <emfPageIdentifier href="HelloWorld.notation#_ovKvYFWjEeKOivupHOJ8Ew"/>
-    </availablePage>
-  </pageList>
-  <sashModel xmi:id="_M_WAxvcXEd-KM6l7lmIPkw" currentSelection="_M_WAyPcXEd-KM6l7lmIPkw">
-    <windows xmi:id="_M_WAx_cXEd-KM6l7lmIPkw">
-      <children xsi:type="di:TabFolder" xmi:id="_M_WAyPcXEd-KM6l7lmIPkw">
-        <children xmi:id="_M_WAy_cXEd-KM6l7lmIPkw">
-          <emfPageIdentifier href="HelloWorld.notation#_7kc7YM__Ed-TP80eVS-2Rg"/>
-        </children>
-        <children xmi:id="_M_WAzPcXEd-KM6l7lmIPkw">
-          <emfPageIdentifier href="HelloWorld.notation#_o6ZisNCREd-hqYHBJe17_Q"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="HelloWorld.notation#_U1UegPcXEd-KM6l7lmIPkw"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="HelloWorld.notation#_0rwpYDefEeGPyrZ5I3hMlA"/>
-        </children>
-      </children>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.di b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.di
deleted file mode 100644
index fe968580adf..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.di
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmi:id="_M_WAwPcXEd-KM6l7lmIPkw">
-  <pageList xmi:id="_M_WAwfcXEd-KM6l7lmIPkw">
-    <availablePage xmi:id="_M_WAwvcXEd-KM6l7lmIPkw">
-      <emfPageIdentifier href="ProducerConsumer.notation#_UstOsM__Ed-TP80eVS-2Rg"/>
-    </availablePage>
-    <availablePage xmi:id="_M_WAxPcXEd-KM6l7lmIPkw">
-      <emfPageIdentifier href="ProducerConsumer.notation#_7kc7YM__Ed-TP80eVS-2Rg"/>
-    </availablePage>
-    <availablePage xmi:id="_M_WAxfcXEd-KM6l7lmIPkw">
-      <emfPageIdentifier href="ProducerConsumer.notation#_o6ZisNCREd-hqYHBJe17_Q"/>
-    </availablePage>
-    <availablePage xmi:id="_U1docPcXEd-KM6l7lmIPkw">
-      <emfPageIdentifier href="ProducerConsumer.notation#_U1UegPcXEd-KM6l7lmIPkw"/>
-    </availablePage>
-    <availablePage xmi:id="_V5fVYP8nEd-hWJO6cv3VJA">
-      <emfPageIdentifier href="ProducerConsumer.notation#_V5euUP8nEd-hWJO6cv3VJA"/>
-    </availablePage>
-    <availablePage>
-      <emfPageIdentifier href="ProducerConsumer.notation#_0rwpYDefEeGPyrZ5I3hMlA"/>
-    </availablePage>
-    <availablePage>
-      <emfPageIdentifier href="ProducerConsumer.notation#_HvdK0FZYEeKKZs15rvNNjA"/>
-    </availablePage>
-  </pageList>
-  <sashModel xmi:id="_M_WAxvcXEd-KM6l7lmIPkw" currentSelection="_M_WAyPcXEd-KM6l7lmIPkw">
-    <windows xmi:id="_M_WAx_cXEd-KM6l7lmIPkw">
-      <children xsi:type="di:TabFolder" xmi:id="_M_WAyPcXEd-KM6l7lmIPkw">
-        <children xmi:id="_M_WAyfcXEd-KM6l7lmIPkw">
-          <emfPageIdentifier href="ProducerConsumer.notation#_UstOsM__Ed-TP80eVS-2Rg"/>
-        </children>
-        <children xmi:id="_M_WAy_cXEd-KM6l7lmIPkw">
-          <emfPageIdentifier href="ProducerConsumer.notation#_7kc7YM__Ed-TP80eVS-2Rg"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="ProducerConsumer.notation#_U1UegPcXEd-KM6l7lmIPkw"/>
-        </children>
-        <children xmi:id="_V5fVYf8nEd-hWJO6cv3VJA">
-          <emfPageIdentifier href="ProducerConsumer.notation#_V5euUP8nEd-hWJO6cv3VJA"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="ProducerConsumer.notation#_0rwpYDefEeGPyrZ5I3hMlA"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="ProducerConsumer.notation#_o6ZisNCREd-hqYHBJe17_Q"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="ProducerConsumer.notation#_HvdK0FZYEeKKZs15rvNNjA"/>
-        </children>
-      </children>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-pullcon.png b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-pullcon.png
deleted file mode 100644
index 1dc0c2310e4..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-pullcon.png
+++ /dev/null
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.png b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.png
deleted file mode 100644
index eafd2786511..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.png
+++ /dev/null
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.project b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/.project
index 29f34de0ecf..29f34de0ecf 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.project
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/.project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/.settings/org.eclipse.jdt.core.prefs
index c537b63063c..c537b63063c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/META-INF/MANIFEST.MF
index ff6f3ed5154..ff6f3ed5154 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/META-INF/MANIFEST.MF
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/about.html b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/about.html
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/build.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/build.properties
index 7b3c227b84a..7b3c227b84a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/build.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/build.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/plugin.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/plugin.properties
index 48c00f652ce..48c00f652ce 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/plugin.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/plugin.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/plugin.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/plugin.xml
index 8c640146657..8c640146657 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/plugin.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/plugin.xml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/pom.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/pom.xml
index a706584e1ec..32c15b387e5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/pom.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cpp.cdtproject</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java
index ad6ab20019d..ad6ab20019d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java
index b712ac949aa..b712ac949aa 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java
index 9066abf68d1..9066abf68d1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CDTSettings.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CDTSettings.java
index 7f44c642855..7f44c642855 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CDTSettings.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CDTSettings.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CNamedProjectWizard.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CNamedProjectWizard.java
index af5e1592c11..af5e1592c11 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CNamedProjectWizard.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CNamedProjectWizard.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CProjectSupport.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CProjectSupport.java
index 9f020fd2354..9f020fd2354 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CProjectSupport.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CProjectSupport.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/C_CppProjectSupport.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/C_CppProjectSupport.java
index f86106b7577..f86106b7577 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/C_CppProjectSupport.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/C_CppProjectSupport.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CppProjectSupport.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CppProjectSupport.java
index aaebf98d1d7..aaebf98d1d7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CppProjectSupport.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CppProjectSupport.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/.classpath b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/.classpath
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.project b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/.project
index 6973103854a..6973103854a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.project
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/.project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/.settings/org.eclipse.jdt.core.prefs
index c537b63063c..c537b63063c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
index 7adeca72822..ae0bde0353e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

  org.eclipse.core.resources,

  org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0"

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

+ org.eclipse.papyrus.qompass.ui;bundle-version="1.2.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/about.html b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/about.html
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/build.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/build.properties
index 93bba3b6fa4..93bba3b6fa4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/build.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/build.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/icons/codegen.gif b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/icons/codegen.gif
index c416117e54e..c416117e54e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/icons/codegen.gif
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/icons/codegen.gif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/plugin.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/plugin.properties
index 53638e41626..53638e41626 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/plugin.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/plugin.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/plugin.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/plugin.xml
index e9111f464b8..eaee4cb817a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/plugin.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/plugin.xml
@@ -5,7 +5,7 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popup.codegen">
+            locationURI="popup:org.eclipse.papyrus.qompass.popup?after=codegen">
           <command
                commandId="org.eclipse.papyrus.cpp.codegen.command"
                icon="icons/codegen.gif"
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/pom.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/pom.xml
index a8c5b87d073..5513933621a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/pom.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cpp.codegen.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/Activator.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/Activator.java
index 7a8e531ea10..7a8e531ea10 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/Activator.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/Activator.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/CDTprojectHandler.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/CDTprojectHandler.java
index ca4efce5b24..ca4efce5b24 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/CDTprojectHandler.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/CDTprojectHandler.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/GenerateCodeHandler.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/GenerateCodeHandler.java
index 8755e9c615c..8755e9c615c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/GenerateCodeHandler.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/GenerateCodeHandler.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/preferences/CodegenPreferencePage.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/preferences/CodegenPreferencePage.java
index 2c84930aecd..2c84930aecd 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/preferences/CodegenPreferencePage.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/preferences/CodegenPreferencePage.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/.classpath
index 358df1bc1d1..358df1bc1d1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.project b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/.project
index 1b4a71a36b8..1b4a71a36b8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.project
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/.project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
index 508918952e5..508918952e5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/about.html b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/about.html
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.acceleo b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/build.acceleo
index 26abe5ae4c9..26abe5ae4c9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.acceleo
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/build.acceleo
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/build.properties
index 143d4e25c7d..143d4e25c7d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/build.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/plugin.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/plugin.properties
index c14d7642918..c14d7642918 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/plugin.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/plugin.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/plugin.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/plugin.xml
index 5cdc98728ed..5cdc98728ed 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/plugin.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/plugin.xml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/pom.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/pom.xml
index 475b2100504..b78a7f04301 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/pom.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/pom.xml
@@ -5,7 +5,7 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cpp.codegen</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
@@ -53,4 +53,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Activator.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Activator.java
index f61e97bca9c..f61e97bca9c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Activator.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Activator.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
index e1f5d37c6ec..e1f5d37c6ec 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/CppLangCodegen.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/CppLangCodegen.java
index 3dc87c06e27..3dc87c06e27 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/CppLangCodegen.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/CppLangCodegen.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java
index ff7d9277d4c..ff7d9277d4c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties
index 611b7081e7e..611b7081e7e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
index 9993ad5e07d..9993ad5e07d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
index 7dd59fbe605..7dd59fbe605 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.java
index 69a18f191c0..69a18f191c0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppLocationStrategy.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppLocationStrategy.java
index ccddad6f9cc..ccddad6f9cc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppLocationStrategy.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppLocationStrategy.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
index ff974a517e5..ff974a517e5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java
index 7653753411f..7653753411f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
index 36043a363ad..36043a363ad 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ILocateCppProject.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ILocateCppProject.java
index 2cdb5d6d945..2cdb5d6d945 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ILocateCppProject.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ILocateCppProject.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/LocateCppProject.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/LocateCppProject.java
index 85f041de711..fad9e7249b4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/LocateCppProject.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/LocateCppProject.java
@@ -47,15 +47,9 @@ public class LocateCppProject {
 	 * @return the associated project, if the C++ nature is applied.
 	 */
 	public static IProject getTargetProject(PackageableElement pe, boolean createIfMissing) {
-		// URI uri = pe.eResource().getURI();
 		Package rootPkg = PackageUtil.getRootPackage(pe);
 
 		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		/*
-		 * if(uri.segmentCount() < 2) {
-		 * return null;
-		 * }
-		 */
 
 		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 		String prefix = store != null ? store.getString(CppCodeGenConstants.P_PROJECT_PREFIX) : "bad preferences."; //$NON-NLS-1$
@@ -64,11 +58,9 @@ public class LocateCppProject {
 		if (!modelProject.exists()) {
 			if (Headless)
 			{
-				try
-				{
+				try {
 					modelProject.create(null);
-				} catch (CoreException e)
-				{
+				} catch (CoreException e) {
 					return null;
 				}
 			}
@@ -99,11 +91,9 @@ public class LocateCppProject {
 		// Make sure the target project is open. If it was just created then it is likely open,
 		// however if it is an old project then it could have been closed.
 		if (!modelProject.isOpen()) {
-			try
-			{
+			try {
 				modelProject.open(null);
-			} catch (CoreException e)
-			{
+			} catch (CoreException e) {
 				return null;
 			}
 		}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Messages.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Messages.java
index aa1c639f0c9..aa1c639f0c9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Messages.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Messages.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
index a55f4f6c0a0..a55f4f6c0a0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/messages.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/messages.properties
index 617270b5e1e..617270b5e1e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/messages.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/messages.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppAttribute.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppAttribute.xtend
index 9324fe993b2..9324fe993b2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppAttribute.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppAttribute.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassAttributesDeclaration.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassAttributesDeclaration.xtend
index 06990f4229b..06990f4229b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassAttributesDeclaration.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassAttributesDeclaration.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassFriendDeclaration.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassFriendDeclaration.xtend
index eafcc2b3cc7..eafcc2b3cc7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassFriendDeclaration.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassFriendDeclaration.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeClassDeclaration.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeClassDeclaration.xtend
index ab952f290cb..ab952f290cb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeClassDeclaration.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeClassDeclaration.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeDeclaration.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeDeclaration.xtend
index a07a939e125..a07a939e125 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeDeclaration.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeDeclaration.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassInheritedDeclarations.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassInheritedDeclarations.xtend
index b6b81c0c5a9..b6b81c0c5a9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassInheritedDeclarations.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassInheritedDeclarations.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsDeclaration.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsDeclaration.xtend
index e41bb495982..e41bb495982 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsDeclaration.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsDeclaration.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsImplementation.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsImplementation.xtend
index 091d40b4f93..091d40b4f93 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsImplementation.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsImplementation.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend
index 65b23596901..65b23596901 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend
index 41af9c68a4b..41af9c68a4b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppDocumentation.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppDocumentation.xtend
index de7dcd05ec5..de7dcd05ec5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppDocumentation.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppDocumentation.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend
index 7ab2661f252..7ab2661f252 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppIncludeUtil.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppIncludeUtil.xtend
index c8623883fe1..c8623883fe1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppIncludeUtil.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppIncludeUtil.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppInnerClassifiers.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppInnerClassifiers.xtend
index 78938c09623..78938c09623 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppInnerClassifiers.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppInnerClassifiers.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend
index 557bd5b1c90..557bd5b1c90 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPackageHeaderGenerator.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPackageHeaderGenerator.xtend
index 4698312f2b8..4698312f2b8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPackageHeaderGenerator.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPackageHeaderGenerator.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppParameter.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppParameter.xtend
index 160265df9b8..160265df9b8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppParameter.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppParameter.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPrimitiveTypes.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPrimitiveTypes.xtend
index 46fcb612a72..46fcb612a72 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPrimitiveTypes.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPrimitiveTypes.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppTemplates.xtend b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppTemplates.xtend
index 13c207c8708..13c207c8708 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppTemplates.xtend
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppTemplates.xtend
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/.gitignore b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/xtend-gen/.gitignore
index c96a04f008e..c96a04f008e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/.gitignore
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen/xtend-gen/.gitignore
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/.classpath b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/.classpath
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/.project b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/.project
index 3e3d8136716..3e3d8136716 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/.project
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/.project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/.settings/org.eclipse.jdt.core.prefs
index c537b63063c..c537b63063c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/META-INF/MANIFEST.MF
index 85f6beaf683..85f6beaf683 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/META-INF/MANIFEST.MF
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/about.html b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/about.html
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/build.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/build.properties
index 9cd110db55b..9cd110db55b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/build.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/build.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.di b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.di
index b61e898b639..b61e898b639 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.di
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.di
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.notation b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.notation
index 38ed3da34a5..38ed3da34a5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.notation
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.notation
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.uml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.uml
index 05f811b27a4..05f811b27a4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.uml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/models/examples/HelloWorldOO.uml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/plugin.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/plugin.properties
index ed68cd6714a..ed68cd6714a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/plugin.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/plugin.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/plugin.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/plugin.xml
index 17282114c08..17282114c08 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/plugin.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/plugin.xml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/pom.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/pom.xml
index 12e53bc4b17..d8dd48c29a8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/pom.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cpp.examples</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/src/org/eclipse/papyrus/cpp/examples/Activator.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/src/org/eclipse/papyrus/cpp/examples/Activator.java
index 4611a96f62d..4611a96f62d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/src/org/eclipse/papyrus/cpp/examples/Activator.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/src/org/eclipse/papyrus/cpp/examples/Activator.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/src/org/eclipse/papyrus/cpp/examples/HelloWorldOOModelWizard.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/src/org/eclipse/papyrus/cpp/examples/HelloWorldOOModelWizard.java
index ee3400e6c43..ee3400e6c43 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/src/org/eclipse/papyrus/cpp/examples/HelloWorldOOModelWizard.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples/src/org/eclipse/papyrus/cpp/examples/HelloWorldOOModelWizard.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.classpath b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.classpath
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/.project b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/.project
index 66792fcc3eb..12be9afc369 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/.project
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.acceleo.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.cpp.library.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/.settings/org.eclipse.jdt.core.prefs
index c537b63063c..c537b63063c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..1e27c1e4fc6
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.cpp.library.ui;singleton:=true
+Bundle-Version: 1.2.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.cpp.library.ui.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/about.html b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/about.html
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/about.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/build.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/build.properties
index f1e29af020a..c52dd5f5b4a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/build.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/build.properties
@@ -2,8 +2,8 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.properties,\
-               about.html,\
+               plugin.xml,\
                icons/,\
-               plugin.xml
+               plugin.properties,\
+               about.html
 src.includes = about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/icons/transfo_cpp.gif b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/icons/transfo_cpp.gif
index 7caaa0fdae8..7caaa0fdae8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/icons/transfo_cpp.gif
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/icons/transfo_cpp.gif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/plugin.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/plugin.properties
index 192d490eefe..f07d7e63ef6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/plugin.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:

 #     CEA LIST - initial API and implementation

 ###############################################################################

-pluginName=Papyrus extra: Debug support for Acceleo code generation(Incubation)

+pluginName=Papyrus C/C++ library - Papyrus-dependent UI registration (Incubation)

 providerName=Eclipse Modeling Project

diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/plugin.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/plugin.xml
new file mode 100644
index 00000000000..c99f8715dd6
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/plugin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.2"?>

+<plugin>

+		<extension

+			point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">

+		<library

+			description="Standard C Ansi types"

+			iconpath="icons/transfo_cpp.gif"

+			name="AnsiCLibrary"

+			path="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml"

+			provider="Eclipse Modeling Project"/>

+	</extension>

+</plugin>

diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/pom.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/pom.xml
new file mode 100644
index 00000000000..fa23868009e
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>../../../../../releng/extra</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.cpp.library.ui</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/Activator.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/src/org/eclipse/papyrus/cpp/library/ui/Activator.java
index 7fbcd820996..489c2549aeb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/Activator.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui/src/org/eclipse/papyrus/cpp/library/ui/Activator.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.cpp.profile;
+package org.eclipse.papyrus.cpp.library.ui;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -9,11 +9,11 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.cpp.profile";
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.cpp.library.ui"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
-
+	
 	/**
 	 * The constructor
 	 */
@@ -22,10 +22,8 @@ public class Activator extends AbstractUIPlugin {
 
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
-	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -33,10 +31,8 @@ public class Activator extends AbstractUIPlugin {
 
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
-	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/.classpath b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/.classpath
index 8a8f1668cdc..121e527a938 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/.classpath
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.project b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/.project
index 09d5deae110..3857c77079e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.project
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.acceleo.debug</name>
+	<name>org.eclipse.papyrus.cpp.library</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..7f1c4878394
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.emf.ecore,

+ org.eclipse.uml2.uml;bundle-version="5.0.0"

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-Activator: org.eclipse.papyrus.cpp.library.Activator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.cpp.library;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/about.html b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/about.html
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/about.html
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/build.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/build.properties
new file mode 100644
index 00000000000..c5bd7ea6135
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/build.properties
@@ -0,0 +1,9 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               models/,\
+               about.html,\
+               plugin.properties
+src.includes = about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.di b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/models/AnsiCLibrary.di
index 27d5dafd653..27d5dafd653 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.di
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/models/AnsiCLibrary.di
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.notation b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/models/AnsiCLibrary.notation
index 039e96e9c0b..039e96e9c0b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.notation
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/models/AnsiCLibrary.notation
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.uml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/models/AnsiCLibrary.uml
index 00ee3486b79..00ee3486b79 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.uml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/models/AnsiCLibrary.uml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/plugin.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/plugin.properties
index 17e06150837..17e06150837 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/plugin.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/plugin.properties
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/plugin.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/plugin.xml
new file mode 100644
index 00000000000..af856732602
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/plugin.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.2"?>

+<plugin>

+	<extension

+			point="org.eclipse.emf.ecore.uri_mapping">

+		<mapping

+			source="pathmap://PapyrusC_Cpp_LIBRARIES/"

+			target="platform:/plugin/org.eclipse.papyrus.cpp.library/models/"/>

+	</extension>

+</plugin>

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/pom.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/pom.xml
index d4ff3f66c7a..9eaa91aaf31 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/pom.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
-	<artifactId>org.eclipse.papyrus.acceleo.debug</artifactId>
+	<artifactId>org.eclipse.papyrus.cpp.library</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Activator.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/src/org/eclipse/papyrus/cpp/library/Activator.java
index defe5cc4f98..8aa6783549d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Activator.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library/src/org/eclipse/papyrus/cpp/library/Activator.java
@@ -1,13 +1,10 @@
-package org.eclipse.papyrus.acceleo;
+package org.eclipse.papyrus.cpp.library;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
 public class Activator implements BundleActivator {
 
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.acceleo"; //$NON-NLS-1$
-
 	private static BundleContext context;
 
 	static BundleContext getContext() {
@@ -16,20 +13,16 @@ public class Activator implements BundleActivator {
 
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
 	 */
-	@Override
 	public void start(BundleContext bundleContext) throws Exception {
 		Activator.context = bundleContext;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
 	 */
-	@Override
 	public void stop(BundleContext bundleContext) throws Exception {
 		Activator.context = null;
 	}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.classpath b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.classpath
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/.project b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/.project
index aaac2164f37..6b25ba93cbc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/.project
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.acceleo</name>
+	<name>org.eclipse.papyrus.cpp.profile.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -20,15 +20,9 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.acceleo.ide.ui.acceleoBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/.settings/org.eclipse.jdt.core.prefs
index c537b63063c..c537b63063c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..0b018987d0c
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.cpp.profile.ui;singleton:=true
+Bundle-Version: 1.2.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.cpp.profile.ui.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/about.html b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/about.html
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/about.html
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/build.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/build.properties
new file mode 100644
index 00000000000..c52dd5f5b4a
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/build.properties
@@ -0,0 +1,9 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               icons/,\
+               plugin.properties,\
+               about.html
+src.includes = about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/resources/icons/transfo_cpp.gif b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/icons/transfo_cpp.gif
index 7caaa0fdae8..7caaa0fdae8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/resources/icons/transfo_cpp.gif
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/icons/transfo_cpp.gif
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/plugin.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/plugin.properties
new file mode 100644
index 00000000000..75bf9a1ecb0
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################

+# 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

+###############################################################################

+pluginName=Papyrus C/C++ profile - Papyrus-dependent UI registration (Incubation)

+providerName=Eclipse Modeling Project

diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/plugin.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/plugin.xml
new file mode 100644
index 00000000000..85f6a4f453d
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/plugin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.2"?>

+<plugin>

+	<extension

+			point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">

+		<profile

+			description="C/C++ profile used for code generation"

+			iconpath="icons/transfo_cpp.gif"

+			name="C/C++ profile"

+			path="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml"

+			provider="Eclipse Modeling Project"/>

+	</extension>

+</plugin>

diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/pom.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/pom.xml
new file mode 100644
index 00000000000..6f28d6a7837
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>../../../../../releng/extra</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.cpp.profile.ui</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/Activator.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/src/org/eclipse/papyrus/cpp/profile/ui/Activator.java
index 2e0ed394293..3f888a06a2e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/Activator.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui/src/org/eclipse/papyrus/cpp/profile/ui/Activator.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.acceleo.debug;
+package org.eclipse.papyrus.cpp.profile.ui;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -9,11 +9,11 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.acceleo.debug"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.cpp.profile.ui"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
-
+	
 	/**
 	 * The constructor
 	 */
@@ -22,10 +22,8 @@ public class Activator extends AbstractUIPlugin {
 
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
-	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -33,10 +31,8 @@ public class Activator extends AbstractUIPlugin {
 
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
-	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/.classpath b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/.classpath
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.project b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/.project
index 1d8b98f86c4..1d8b98f86c4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.project
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/.project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
index 08fc01f383b..a43afee6ea3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
@@ -1,10 +1,7 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.uml2.uml;bundle-version="3.1.0";visibility:=reexport

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.emf.ecore,

+ org.eclipse.uml2.uml;bundle-version="5.0.0"

 Export-Package: org.eclipse.papyrus.C_Cpp,

  org.eclipse.papyrus.C_Cpp.impl,

  org.eclipse.papyrus.C_Cpp.util,

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/about.html b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/about.html
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/build.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/build.properties
index e962c668873..8904618deb7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/build.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                profiles/,\
                libraries/,\
-               icons/,\
                about.html,\
                plugin.properties
 src.includes = about.html
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.di b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.di
new file mode 100644
index 00000000000..27d5dafd653
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ASCII"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="AnsiCLibrary.notation#_r0SgwOmIEeG_gcDHG3asaQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="AnsiCLibrary.notation#_r0SgwOmIEeG_gcDHG3asaQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.notation b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.notation
new file mode 100644
index 00000000000..039e96e9c0b
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.notation
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r0SgwOmIEeG_gcDHG3asaQ" type="PapyrusUMLClassDiagram" name="AnsiC" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_txw6EOmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tyJ7oOmIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tyJ7oemIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tyJ7oumIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tyJ7o-mIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tyKisOmIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tyKisemIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_tyM-8OmIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txw6EemIEeG_gcDHG3asaQ" x="45" y="99"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_t56wgOmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t56wgumIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t57XkOmIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t57XkemIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t57XkumIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t57Xk-mIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t57XlOmIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_t57XlemIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_6j0jABydEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t56wgemIEeG_gcDHG3asaQ" x="171" y="171"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_t_tPcOmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t_t2gOmIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t_t2gemIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t_udkOmIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t_udkemIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t_udkumIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t_udk-mIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_t_udlOmIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_7W3wkBydEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t_tPcemIEeG_gcDHG3asaQ" x="45" y="171"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_uE_YEOmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uE__IOmIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uE__IemIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uE__IumIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uE__I-mIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uE__JOmIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uE__JemIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uE__JumIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uE_YEemIEeG_gcDHG3asaQ" x="45" y="324"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_uJrDwOmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uJrq0emIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uJrq0umIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uJsR4OmIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uJsR4emIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uJsR4umIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uJsR4-mIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uJsR5OmIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uJrq0OmIEeG_gcDHG3asaQ" x="45" y="27"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_uOhukOmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uOiVoOmIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uOiVoemIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uOiVoumIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uOiVo-mIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uOiVpOmIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uOiVpemIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uOiVpumIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_8heigBydEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uOhukemIEeG_gcDHG3asaQ" x="45" y="396"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_uSY64OmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uSZh8OmIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uSZh8emIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uSZh8umIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uSZh8-mIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uSZh9OmIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uSZh9emIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uSZh9umIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_DLNPkByeEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uSY64emIEeG_gcDHG3asaQ" x="297" y="171"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_uV6I8OmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uV6wAOmIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uV6wAemIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uV6wAumIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uV6wA-mIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uV6wBOmIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uV6wBemIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uV6wBumIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_K-lFQByeEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uV6I8emIEeG_gcDHG3asaQ" x="45" y="252"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_uZYTsOmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uZY6wOmIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uZY6wemIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uZY6wumIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uZY6w-mIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uZY6xOmIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uZY6xemIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uZY6xumIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uZYTsemIEeG_gcDHG3asaQ" x="171" y="324"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_uc13YOmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uc13YumIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uc2ecOmIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uc2ecemIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uc2ecumIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uc2ec-mIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uc2edOmIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uc2edemIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_V5vyUByeEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uc13YemIEeG_gcDHG3asaQ" x="171" y="252"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_uf0S4OmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uf058OmIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uf058emIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uf058umIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uf058-mIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uf059OmIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uf059emIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uf059umIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_YYWiwByeEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uf0S4emIEeG_gcDHG3asaQ" x="171" y="99"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_ujIsoOmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ujJTsOmIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ujJTsemIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ujJTsumIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ujJTs-mIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ujJTtOmIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ujJTtemIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_ujJTtumIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_a1wZUByeEduyofBvg4RL2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ujIsoemIEeG_gcDHG3asaQ" x="171" y="396"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_umgJsOmIEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_umgJsumIEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_umgJs-mIEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_umgwwOmIEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_umgwwemIEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_umgwwumIEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_umgww-mIEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_umgwxOmIEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_vAIV4I7PEdySGvm5GN66HA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_umgJsemIEeG_gcDHG3asaQ" x="45" y="468"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_V3vUcOmJEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V3wikOmJEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3wikemJEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V3wikumJEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3wik-mJEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V3wilOmJEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3wilemJEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_V3wilumJEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_V3dAkOmJEeG_gcDHG3asaQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3vUcemJEeG_gcDHG3asaQ" x="482" y="324"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_Y4Nb0OmJEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y4OC4OmJEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y4OC4emJEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y4OC4umJEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y4OC4-mJEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y4OC5OmJEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y4OC5emJEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Y4OC5umJEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_Y3550OmJEeG_gcDHG3asaQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y4Nb0emJEeG_gcDHG3asaQ" x="648" y="324"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_yJ0C8OmJEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yJ0qAOmJEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yJ0qAemJEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yJ0qAumJEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yJ0qA-mJEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yJ0qBOmJEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yJ0qBemJEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_yJ0qBumJEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_yJpD0OmJEeG_gcDHG3asaQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yJ0C8emJEeG_gcDHG3asaQ" x="483" y="396"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_1rBf4OmJEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1rBf4umJEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1rCG8OmJEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1rCG8emJEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1rCG8umJEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1rCG8-mJEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1rCG9OmJEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_1rCG9emJEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_1q1SoOmJEeG_gcDHG3asaQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1rBf4emJEeG_gcDHG3asaQ" x="648" y="396"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_6hSrQOmJEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6hSrQumJEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6hSrQ-mJEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6hSrROmJEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6hSrRemJEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6hTSUOmJEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6hTSUemJEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_6hTSUumJEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_6hHFEOmJEeG_gcDHG3asaQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6hSrQemJEeG_gcDHG3asaQ" x="483" y="468"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_8kvJsOmJEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8kvJsumJEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8kvJs-mJEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8kvJtOmJEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8kvwwOmJEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8kvwwemJEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8kvwwumJEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_8kvww-mJEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_8kiVYOmJEeG_gcDHG3asaQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8kvJsemJEeG_gcDHG3asaQ" x="648" y="468"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_J8FlUOmKEeG_gcDHG3asaQ" type="2012" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J8GMYOmKEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_J8GMYemKEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J8GMYumKEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_J8GMY-mKEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J8GMZOmKEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_J8GMZemKEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_J8GMZumKEeG_gcDHG3asaQ" type="5038"/>
+    <element xmi:type="uml:Comment" href="AnsiCLibrary.uml#_J6d0sOmKEeG_gcDHG3asaQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J8FlUemKEeG_gcDHG3asaQ" x="549" y="171" width="157" height="46"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_b2FFsOmKEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b2FswOmKEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b2FswemKEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b2FswumKEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b2Fsw-mKEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b2FsxOmKEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b2GT0OmKEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_b2GT0emKEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_b1zY4OmKEeG_gcDHG3asaQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b2FFsemKEeG_gcDHG3asaQ" x="482" y="99"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_zMqxoOmKEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zMrYsOmKEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zMrYsemKEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zMr_wOmKEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zMr_wemKEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zMr_wumKEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zMr_w-mKEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_zMr_xOmKEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_zL7x0OmKEeG_gcDHG3asaQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zMqxoemKEeG_gcDHG3asaQ" x="484" y="254"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_0_OUYOmKEeG_gcDHG3asaQ" type="2009" fontName="Sans Serif" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0_O7cOmKEeG_gcDHG3asaQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0_O7cemKEeG_gcDHG3asaQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0_O7cumKEeG_gcDHG3asaQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0_O7c-mKEeG_gcDHG3asaQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0_O7dOmKEeG_gcDHG3asaQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0_O7demKEeG_gcDHG3asaQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_0_O7dumKEeG_gcDHG3asaQ" type="5032"/>
+    <element xmi:type="uml:PrimitiveType" href="AnsiCLibrary.uml#_0-8nkOmKEeG_gcDHG3asaQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0_OUYemKEeG_gcDHG3asaQ" x="646" y="252"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r0SgwemIEeG_gcDHG3asaQ"/>
+  <element xmi:type="uml:Model" href="AnsiCLibrary.uml#_DV8nkBv8EduZN5aJJITI5w"/>
+  <edges xmi:type="notation:Connector" xmi:id="_NZwmEOmKEeG_gcDHG3asaQ" type="4013" source="_J8FlUOmKEeG_gcDHG3asaQ" target="_zMqxoOmKEeG_gcDHG3asaQ" lineColor="0">
+    <styles xmi:type="notation:FontStyle" xmi:id="_NZwmEemKEeG_gcDHG3asaQ" fontName="Sans Serif"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NZwmEumKEeG_gcDHG3asaQ" points="[-4, 14, 0, -50]$[14, 61, 18, -3]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nab7gOmKEeG_gcDHG3asaQ" id="(0.15346534653465346,0.7666666666666667)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nab7gemKEeG_gcDHG3asaQ" id="(0.81,0.14)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_OAB74OmKEeG_gcDHG3asaQ" type="4013" source="_J8FlUOmKEeG_gcDHG3asaQ" target="_0_OUYOmKEeG_gcDHG3asaQ" lineColor="0">
+    <styles xmi:type="notation:FontStyle" xmi:id="_OAB74emKEeG_gcDHG3asaQ" fontName="Sans Serif"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OAB74umKEeG_gcDHG3asaQ" points="[-7, 11, 0, -55]$[-20, 67, -13, 1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OAP-UOmKEeG_gcDHG3asaQ" id="(0.7707006369426752,0.9130434782608695)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OAP-UemKEeG_gcDHG3asaQ" id="(0.17,0.16)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_gCpMwOmKEeG_gcDHG3asaQ" type="4013" source="_J8FlUOmKEeG_gcDHG3asaQ" target="_b2FFsOmKEeG_gcDHG3asaQ" lineColor="0">
+    <styles xmi:type="notation:FontStyle" xmi:id="_gCpMwemKEeG_gcDHG3asaQ" fontName="Sans Serif"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gCpMwumKEeG_gcDHG3asaQ" points="[0, -5, 0, 54]$[18, -58, 18, 1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gC2BEOmKEeG_gcDHG3asaQ" id="(0.14012738853503184,0.10869565217391304)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gC2BEemKEeG_gcDHG3asaQ" id="(0.82,0.54)"/>
+  </edges>
+</notation:Diagram>
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.uml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.uml
new file mode 100644
index 00000000000..00ee3486b79
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/libraries/AnsiCLibrary.uml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+  <uml:Model xmi:id="_DV8nkBv8EduZN5aJJITI5w" name="AnsiCLibrary">
+    <ownedComment xmi:id="_J6d0sOmKEeG_gcDHG3asaQ" annotatedElement="_b1zY4OmKEeG_gcDHG3asaQ _0-8nkOmKEeG_gcDHG3asaQ _zL7x0OmKEeG_gcDHG3asaQ">
+      <body>Platform independent fixed size types</body>
+    </ownedComment>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5lVhgBydEduyofBvg4RL2w" name="char"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_6j0jABydEduyofBvg4RL2w" name="double"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_7W3wkBydEduyofBvg4RL2w" name="float"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_7wRIABydEduyofBvg4RL2w" name="int"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_8I6RgBydEduyofBvg4RL2w" name="void"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_8heigBydEduyofBvg4RL2w" name="long"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DLNPkByeEduyofBvg4RL2w" name="long double"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_K-lFQByeEduyofBvg4RL2w" name="short"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_LTZesByeEduyofBvg4RL2w" name="unsigned int"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_V5vyUByeEduyofBvg4RL2w" name="unsigned short"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_YYWiwByeEduyofBvg4RL2w" name="unsigned char"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_a1wZUByeEduyofBvg4RL2w" name="unsigned long"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_vAIV4I7PEdySGvm5GN66HA" name="bool"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_V3dAkOmJEeG_gcDHG3asaQ" name="int16_t"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Y3550OmJEeG_gcDHG3asaQ" name="uint16_t"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yJpD0OmJEeG_gcDHG3asaQ" name="int32_t"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_1q1SoOmJEeG_gcDHG3asaQ" name="uint32_t"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_6hHFEOmJEeG_gcDHG3asaQ" name="int64_t"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_8kiVYOmJEeG_gcDHG3asaQ" name="uint64_t"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_b1zY4OmKEeG_gcDHG3asaQ" name="wchar_t"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_zL7x0OmKEeG_gcDHG3asaQ" name="int8_t"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_0-8nkOmKEeG_gcDHG3asaQ" name="uint8_t"/>
+    <profileApplication xmi:id="_a7EN4CAREdu9HM4q-Epbgg">
+      <eAnnotations xmi:id="_a7EN4SAREdu9HM4q-Epbgg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
+      </eAnnotations>
+      <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>
+    </profileApplication>
+  </uml:Model>
+  <l2:ModelLibrary xmi:id="_c2eKoCAREdu9HM4q-Epbgg" base_Package="_DV8nkBv8EduZN5aJJITI5w"/>
+</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/plugin.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/plugin.properties
index ddde138c946..17e06150837 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/plugin.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:

 #     CEA LIST - initial API and implementation

 ###############################################################################

-pluginName=Acceleo integration (Incubation)

+pluginName=Papyrus C/C++ profile (Incubation)

 providerName=Eclipse Modeling Project

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/plugin.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/plugin.xml
index c6442e7a3fc..74b5096608a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/plugin.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/plugin.xml
@@ -4,9 +4,6 @@
 	<extension

 			point="org.eclipse.emf.ecore.uri_mapping">

 		<mapping

-			source="pathmap://PapyrusC_Cpp_LIBRARIES/"

-			target="platform:/plugin/org.eclipse.papyrus.cpp.profile/libraries/"/>

-		<mapping

 			source="pathmap://PapyrusC_Cpp_PROFILES/"

 			target="platform:/plugin/org.eclipse.papyrus.cpp.profile/profiles/"/>

 	</extension>

@@ -18,25 +15,6 @@
 			location="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>

 	</extension>

 

-	<extension

-			point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">

-		<library

-			description="Standard C Ansi types"

-			iconpath="icons/transfo_cpp.gif"

-			name="AnsiCLibrary"

-			path="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml"

-			provider="Eclipse Modeling Project"/>

-	</extension>

-   

-	<extension

-			point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">

-		<profile

-			description="C/C++ profile used for code generation"

-			iconpath="icons/transfo_cpp.gif"

-			name="C/C++ profile"

-			path="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml"

-			provider="Eclipse Modeling Project"/>

-	</extension>

    <extension point="org.eclipse.emf.ecore.generated_package">

       <!-- @generated C_Cpp -->

       <package

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/pom.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/pom.xml
index 03adb18d9de..19a9f1410e6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/pom.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
-	<artifactId>org.eclipse.papyrus.acceleo.ui</artifactId>
+	<artifactId>org.eclipse.papyrus.cpp.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
index 65ebda94e6b..65ebda94e6b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
index 1273b29c170..1273b29c170 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.di b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.di
index 134e5584ee5..134e5584ee5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.di
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.di
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation
index 5acb64df288..5acb64df288 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
index 624c26dd6b5..624c26dd6b5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.di b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.di
index 89f2786c0ea..89f2786c0ea 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.di
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.di
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.notation b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.notation
index 8d2827ae033..8d2827ae033 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.notation
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.notation
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.uml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.uml
index 8684a4b4967..8684a4b4967 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.uml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/profiles/PapyrusC.profile.uml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
index 54cbd8163d2..54cbd8163d2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
index 23497620ac3..23497620ac3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
index e58139c0869..e58139c0869 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Const.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Const.java
index 62008d61ba0..62008d61ba0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Const.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Const.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ConstInit.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ConstInit.java
index 70939be35c4..70939be35c4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ConstInit.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ConstInit.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppInit.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppInit.java
index 8f239695d33..8f239695d33 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppInit.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppInit.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppRoot.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppRoot.java
index 2f603ef6f4e..2f603ef6f4e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppRoot.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppRoot.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EAccessKind.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EAccessKind.java
index 57a8c292c1f..57a8c292c1f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EAccessKind.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EAccessKind.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EStorageClass.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EStorageClass.java
index 09807524d5a..09807524d5a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EStorageClass.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EStorageClass.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternLibrary.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternLibrary.java
index 21811e3917f..21811e3917f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternLibrary.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternLibrary.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/External.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/External.java
index 26d9af0e307..26d9af0e307 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/External.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/External.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Friend.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Friend.java
index 3971ecf9257..3971ecf9257 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Friend.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Friend.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Include.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Include.java
index 734252a47b3..734252a47b3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Include.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Include.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Inline.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Inline.java
index 737bc194134..737bc194134 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Inline.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Inline.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ManualGeneration.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ManualGeneration.java
index b28650aae64..b28650aae64 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ManualGeneration.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ManualGeneration.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Mutable.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Mutable.java
index 9ca0a41cd6a..9ca0a41cd6a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Mutable.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Mutable.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/NoCodeGen.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/NoCodeGen.java
index 2436e6bddc4..2436e6bddc4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/NoCodeGen.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/NoCodeGen.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ptr.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ptr.java
index ce60c416a38..ce60c416a38 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ptr.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ptr.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ref.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ref.java
index 535918f01cf..535918f01cf 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ref.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ref.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java
index 478fd5e5fb6..478fd5e5fb6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Template.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Template.java
index 66d729cb018..66d729cb018 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Template.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Template.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateBinding.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateBinding.java
index 5f9e868c814..5f9e868c814 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateBinding.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateBinding.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateParameter.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateParameter.java
index 1c67ebfec79..1c67ebfec79 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateParameter.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateParameter.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Typedef.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Typedef.java
index 99be18e2013..99be18e2013 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Typedef.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Typedef.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Union.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Union.java
index 1edfbd0d38a..1edfbd0d38a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Union.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Union.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Variadic.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Variadic.java
index 37ead44821e..37ead44821e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Variadic.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Variadic.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Virtual.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Virtual.java
index 60b209bef50..60b209bef50 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Virtual.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Virtual.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Visibility.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Visibility.java
index aea7299af55..aea7299af55 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Visibility.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Visibility.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/VisibilityKind.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/VisibilityKind.java
index 4ea258e178e..4ea258e178e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/VisibilityKind.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/VisibilityKind.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Volatile.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Volatile.java
index 6a80992fc11..6a80992fc11 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Volatile.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Volatile.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java
index 91a71d01d85..91a71d01d85 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
index e16267d1b13..e16267d1b13 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
index 9d62fda5089..9d62fda5089 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java
index 0f14741165d..0f14741165d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java
index 0e0bfc786c3..0e0bfc786c3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java
index 51cded9d983..51cded9d983 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java
index 99ecba8d819..99ecba8d819 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java
index 3be2fad1a1a..3be2fad1a1a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java
index 02982a5840c..02982a5840c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java
index 128e37db5aa..128e37db5aa 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java
index e8d5bf7b6da..e8d5bf7b6da 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java
index 091904f7416..091904f7416 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java
index 4507d67ed3b..4507d67ed3b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/MutableImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/MutableImpl.java
index d0d2217c44d..d0d2217c44d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/MutableImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/MutableImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java
index 123867448aa..123867448aa 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java
index e0d4cf2d577..e0d4cf2d577 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java
index 59529e7d1e4..59529e7d1e4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java
index e2300c07f8e..e2300c07f8e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java
index 097340a211b..097340a211b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java
index 17a3a741071..17a3a741071 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java
index 2ba65fbebfb..2ba65fbebfb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java
index dd30383f008..dd30383f008 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java
index ece4ef86bb1..ece4ef86bb1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VariadicImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VariadicImpl.java
index d59834ca4ad..d59834ca4ad 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VariadicImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VariadicImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java
index 0455159368d..0455159368d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java
index 6d865b6a19e..6d865b6a19e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VolatileImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VolatileImpl.java
index 6ac65d9f088..6ac65d9f088 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VolatileImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VolatileImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
index b00c2921104..b00c2921104 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceFactoryImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceFactoryImpl.java
index 606f055aab1..606f055aab1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceFactoryImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceFactoryImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceImpl.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceImpl.java
index c728ce68f13..c728ce68f13 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceImpl.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
index cc3991bb0e4..cc3991bb0e4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppXMLProcessor.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppXMLProcessor.java
index e66da34caf6..e66da34caf6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppXMLProcessor.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppXMLProcessor.java
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/Activator.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/Activator.java
new file mode 100644
index 00000000000..6e341a2a8dc
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/Activator.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.cpp.profile;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/.cproject b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/.cproject
index 7625f2eab4a..7625f2eab4a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/.cproject
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/.cproject
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/.gitignore b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/.gitignore
index b946e6f080e..b946e6f080e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/.gitignore
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/.gitignore
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/.project b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/.project
index 81efcb02b14..81efcb02b14 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/.project
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/.project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.di b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.di
index b1b3ed6ae2a..b1b3ed6ae2a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.di
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.di
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.notation b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.notation
index 322e298d2d9..322e298d2d9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.notation
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.notation
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.uml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.uml
index 46032827278..46032827278 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.uml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.uml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di
index 3acfa5281bc..3acfa5281bc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation
index 6c917c29662..6c917c29662 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml
index 968950faadb..968950faadb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.classpath b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.classpath
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.project b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/.project
index d1004a0c6d3..d1004a0c6d3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.project
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/.project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
index 07583f0dffc..2317f744580 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
@@ -2,32 +2,27 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.ui.editors;bundle-version="3.7.0",

- org.eclipse.text,

  org.eclipse.emf.ecore;bundle-version="2.7.0",

  org.eclipse.uml2.uml;bundle-version="3.2.0",

- org.eclipse.emf.transaction,

- org.eclipse.emf.workspace,

  org.eclipse.jface.text;bundle-version="3.7.0",

- org.eclipse.gmf.runtime.common.core,

  org.eclipse.gmf.runtime.emf.type.core,

  org.eclipse.cdt.core;bundle-version="5.4.0",

  org.eclipse.cdt.ui;bundle-version="5.4.0",

  org.eclipse.cdt.codan.ui.cxx;bundle-version="3.2.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

  org.eclipse.papyrus.cpp.profile;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

  org.eclipse.papyrus.texteditor.model;bundle-version="1.2.0",

  org.eclipse.ui.ide;bundle-version="3.9.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.codegen.base;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

  org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.2.0",

- org.eclipse.papyrus.cpp.codegen;bundle-version="1.2.0"

+ org.eclipse.papyrus.cpp.codegen;bundle-version="1.2.0",

+ org.eclipse.papyrus.qompass.ui;bundle-version="1.2.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/about.html b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/about.html
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/build.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/build.properties
index dca8cd871c9..dca8cd871c9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/build.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/build.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/icons/texteditor.gif b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/icons/texteditor.gif
index 0d1a28947ba..0d1a28947ba 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/icons/texteditor.gif
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/icons/texteditor.gif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/icons/texteditor.xcf b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/icons/texteditor.xcf
index 1749c428883..1749c428883 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/icons/texteditor.xcf
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/icons/texteditor.xcf
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/plugin.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/plugin.properties
index 7e334617814..7e334617814 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/plugin.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/plugin.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/plugin.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/plugin.xml
index 12a8ca49a2a..56bc6713d41 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/plugin.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/plugin.xml
@@ -27,7 +27,7 @@
          point="org.eclipse.ui.menus">

       <menuContribution

             allPopups="false"

-            locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">

+            locationURI="popup:org.eclipse.papyrus.qompass.popup?after=codegen">

          <command

                commandId="org.eclipse.papyrus.exteditor.cdt.openeditor"

                id="org.eclipse.papyrus.exteditor.cdt.open"

@@ -40,22 +40,6 @@
       </menuContribution>

    </extension>

    <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">

-         <command

-               commandId="org.eclipse.papyrus.exteditor.cdt.openeditor"

-               id="org.eclipse.papyrus.exteditor.cdt.openD"

-               icon="icons/texteditor.gif"

-               style="push">

-            <visibleWhen

-                  checkEnabled="true">

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-   <extension

          point="org.eclipse.papyrus.infra.core.modelListener">

       <listener

             name="org.eclipse.papyrus.exteditor.cdt.listener.ModelListener"

diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/pom.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/pom.xml
index 9938c82c7e0..6809579191e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/pom.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.texteditor.cdt</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/Activator.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/Activator.java
index f69ef78e6f2..f69ef78e6f2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/Activator.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/Activator.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/AddProfileAndModelLibsHandler.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/AddProfileAndModelLibsHandler.java
index fa0e02c1594..fa0e02c1594 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/AddProfileAndModelLibsHandler.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/AddProfileAndModelLibsHandler.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/CommandSupport.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/CommandSupport.java
index a3e32434420..a3e32434420 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/CommandSupport.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/CommandSupport.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/TextEditorConstants.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/TextEditorConstants.java
index 2436b7373b5..2436b7373b5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/TextEditorConstants.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/TextEditorConstants.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/Utils.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/Utils.java
index 2beb89ab936..2beb89ab936 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/Utils.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/Utils.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/DelegatingSourceViewer.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/DelegatingSourceViewer.java
index f5d61481370..f5d61481370 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/DelegatingSourceViewer.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/DelegatingSourceViewer.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/PapyrusCDTEditor.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/PapyrusCDTEditor.java
index 4ae37530cac..4ae37530cac 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/PapyrusCDTEditor.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/PapyrusCDTEditor.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java
index f4f552858e7..f4f552858e7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java
index 7d6df1edfc4..7d6df1edfc4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/ChangeKind.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/ChangeKind.java
index c6e407ed35f..c6e407ed35f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/ChangeKind.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/ChangeKind.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/Closure.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/Closure.java
index b81203d94bc..b81203d94bc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/Closure.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/Closure.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/ModelListener.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/ModelListener.java
index 18bc74c536e..18bc74c536e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/ModelListener.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/ModelListener.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/OperationHistoryListener.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/OperationHistoryListener.java
index ca34d6ab0ba..ca34d6ab0ba 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/OperationHistoryListener.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/listener/OperationHistoryListener.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/modelresource/TextEditorModelSharedResource.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/modelresource/TextEditorModelSharedResource.java
index 7781972dd12..7781972dd12 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/modelresource/TextEditorModelSharedResource.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/modelresource/TextEditorModelSharedResource.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferenceConstants.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferenceConstants.java
index ca20cafca87..ca20cafca87 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferenceConstants.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferenceConstants.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferenceInitializer.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferenceInitializer.java
index 494838690c5..494838690c5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferenceInitializer.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferenceInitializer.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferencePage.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferencePage.java
index efc94febace..efc94febace 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferencePage.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/preferences/CDTPreferencePage.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/FindTransition.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/FindTransition.java
index e737e45abf3..e737e45abf3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/FindTransition.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/FindTransition.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/ObtainICElement.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/ObtainICElement.java
index e5457380c45..e5457380c45 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/ObtainICElement.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/ObtainICElement.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/ParameterModifiers.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/ParameterModifiers.java
index 8601ac73484..8601ac73484 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/ParameterModifiers.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/ParameterModifiers.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/RevealCurrentOperation.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/RevealCurrentOperation.java
index cf53a0b5468..cf53a0b5468 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/RevealCurrentOperation.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/RevealCurrentOperation.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncCDTtoModel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncCDTtoModel.java
index 1a0d635b974..1a0d635b974 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncCDTtoModel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncCDTtoModel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncModelToCDT.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncModelToCDT.java
index 207dfa013c9..207dfa013c9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncModelToCDT.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncModelToCDT.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.classpath b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.classpath
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.project b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/.project
index c547cbe1809..c547cbe1809 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.project
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/.project
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/.settings/org.eclipse.jdt.core.prefs
index c537b63063c..c537b63063c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
index 786a003cbc7..3e836907323 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

+ org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.100"

 Export-Package: org.eclipse.papyrus.views.cpp; uses:="org.eclipse.ui,

  com.cea.papyrus.views.panels,

  org.eclipse.jface.viewers,

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/about.html b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/about.html
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/about.ini b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/about.ini
index 9b4b2c53944..9b4b2c53944 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/about.ini
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/about.ini
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/build.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/build.properties
index b961dfd1fd2..b961dfd1fd2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/build.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/build.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/plugin.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/plugin.properties
index 7ced719d446..7ced719d446 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/plugin.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/plugin.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/plugin.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/plugin.xml
index 90b2f91a207..90b2f91a207 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/plugin.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/plugin.xml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/pom.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/pom.xml
index 6c729396c72..088bc59db8a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/pom.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.cpp</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/resources/icons/Papyrus_32x32.gif b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/resources/icons/Papyrus_32x32.gif
index a57b9d92dee..a57b9d92dee 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/resources/icons/Papyrus_32x32.gif
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/resources/icons/Papyrus_32x32.gif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/resources/icons/save_edit.gif b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/resources/icons/save_edit.gif
index 499dd0ca602..499dd0ca602 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/resources/icons/save_edit.gif
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/resources/icons/save_edit.gif
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/resources/icons/transfo_cpp.gif b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/resources/icons/transfo_cpp.gif
new file mode 100644
index 00000000000..7caaa0fdae8
--- /dev/null
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/resources/icons/transfo_cpp.gif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/resources/icons/transfo_cpp_old.gif b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/resources/icons/transfo_cpp_old.gif
index 4b39411daf5..4b39411daf5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/resources/icons/transfo_cpp_old.gif
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/resources/icons/transfo_cpp_old.gif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/resources/icons/undo_edit.gif b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/resources/icons/undo_edit.gif
index eae118ad168..eae118ad168 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/resources/icons/undo_edit.gif
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/resources/icons/undo_edit.gif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/AbstractCppPanelView.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/AbstractCppPanelView.java
index d04e1955e35..d04e1955e35 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/AbstractCppPanelView.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/AbstractCppPanelView.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/Activator.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/Activator.java
index 589debbdf42..589debbdf42 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/Activator.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/Activator.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/Activator.properties b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/Activator.properties
index 79979449eba..79979449eba 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/Activator.properties
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/Activator.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CommandSupport.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CommandSupport.java
index ab69b52fd0d..ab69b52fd0d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CommandSupport.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CommandSupport.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CppPanelView.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CppPanelView.java
index 677adbf80db..677adbf80db 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CppPanelView.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CppPanelView.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/listeners/UMLElementPanelListener.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/listeners/UMLElementPanelListener.java
index 6c7f1b59a6c..6c7f1b59a6c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/listeners/UMLElementPanelListener.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/listeners/UMLElementPanelListener.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppAbstractPanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppAbstractPanel.java
index 7a7ee2cbaba..7a7ee2cbaba 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppAbstractPanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppAbstractPanel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppBehaviorPanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppBehaviorPanel.java
index 00a143d0f99..00a143d0f99 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppBehaviorPanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppBehaviorPanel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppClassPanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppClassPanel.java
index 7d3d6c40d07..7d3d6c40d07 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppClassPanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppClassPanel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppDefaultPanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppDefaultPanel.java
index 2d0c1419e51..2d0c1419e51 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppDefaultPanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppDefaultPanel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppGeneralizationPanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppGeneralizationPanel.java
index 40fc2e0a61e..40fc2e0a61e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppGeneralizationPanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppGeneralizationPanel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppOperationPanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppOperationPanel.java
index 892a7a3a655..25bfd8992ec 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppOperationPanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppOperationPanel.java
@@ -18,7 +18,6 @@ import org.eclipse.papyrus.C_Cpp.ConstInit;
 import org.eclipse.papyrus.C_Cpp.Friend;

 import org.eclipse.papyrus.C_Cpp.Inline;

 import org.eclipse.papyrus.C_Cpp.Virtual;

-import org.eclipse.papyrus.cpp.profile.StdStereo;

 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;

 import org.eclipse.papyrus.views.cpp.CommandSupport;

 import org.eclipse.swt.SWT;

@@ -38,6 +37,8 @@ import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.OpaqueBehavior;

 import org.eclipse.uml2.uml.Operation;

 import org.eclipse.uml2.uml.UMLPackage;

+import org.eclipse.uml2.uml.profile.standard.Create;

+import org.eclipse.uml2.uml.profile.standard.Destroy;

 import org.eclipse.uml2.uml.util.UMLUtil;

 

 

@@ -387,11 +388,11 @@ public class CppOperationPanel extends CppAbstractPanel {
 		boolean boxState = isCreate.getSelection();

 

 		if (boxState) {

-			StereotypeUtil.apply(selectedOperation, StdStereo.create);

+			StereotypeUtil.apply(selectedOperation, Create.class);

 		}

 		else {

 			StereotypeUtil.unapply(selectedOperation, ConstInit.class);

-			StereotypeUtil.unapply(selectedOperation, StdStereo.create);

+			StereotypeUtil.unapply(selectedOperation, Create.class);

 		}

 

 		groupCInit.setEnabled(boxState);

@@ -405,10 +406,10 @@ public class CppOperationPanel extends CppAbstractPanel {
 		boolean boxState = isDestroy.getSelection();

 

 		if (boxState) {

-			StereotypeUtil.apply(selectedOperation, StdStereo.destroy);

+			StereotypeUtil.apply(selectedOperation, Destroy.class);

 		}

 		else {

-			StereotypeUtil.unapply(selectedOperation, StdStereo.destroy);

+			StereotypeUtil.unapply(selectedOperation, Destroy.class);

 		}

 	}

 

@@ -564,8 +565,8 @@ public class CppOperationPanel extends CppAbstractPanel {
 			isStatic.setSelection(selectedOperation.isStatic());

 			isConst.setSelection(StereotypeUtil.isApplied(selectedOperation, Const.class));

 			isFriend.setSelection(StereotypeUtil.isApplied(selectedOperation, Friend.class));

-			isCreate.setSelection(StereotypeUtil.isApplied(selectedOperation, StdStereo.create));

-			isDestroy.setSelection(StereotypeUtil.isApplied(selectedOperation, StdStereo.destroy));

+			isCreate.setSelection(StereotypeUtil.isApplied(selectedOperation, Create.class));

+			isDestroy.setSelection(StereotypeUtil.isApplied(selectedOperation, Destroy.class));

 		}

 	}

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPackagePanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPackagePanel.java
index ef8b80141c4..ef8b80141c4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPackagePanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPackagePanel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppParameterPanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppParameterPanel.java
index 15b1ff3bda2..15b1ff3bda2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppParameterPanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppParameterPanel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPrimitiveTypePanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPrimitiveTypePanel.java
index adee09cef57..adee09cef57 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPrimitiveTypePanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPrimitiveTypePanel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPropertyPanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPropertyPanel.java
index 2d449799e6e..2d449799e6e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPropertyPanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPropertyPanel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateBindingPanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateBindingPanel.java
index ff62c9613f1..ff62c9613f1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateBindingPanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateBindingPanel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateParameterPanel.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateParameterPanel.java
index 4726c644d03..4726c644d03 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateParameterPanel.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateParameterPanel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/PanelFactory.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/PanelFactory.java
index ae12cb171da..ae12cb171da 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/PanelFactory.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/PanelFactory.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java-updatesite/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java-updatesite/.project
index 0cc00efb223..0cc00efb223 100644
--- a/extraplugins/java/org.eclipse.papyrus.java-updatesite/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java-updatesite/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java-updatesite/site.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java-updatesite/site.xml
index 7ca05aad69a..7ca05aad69a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java-updatesite/site.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java-updatesite/site.xml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.project
index 189ce3e8668..189ce3e8668 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF
index 9c9e594967b..9c9e594967b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/build.properties
index 81e0fbf3cff..81e0fbf3cff 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/generate.psd b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/generate.psd
index 9a555a938e1..9a555a938e1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/generate.psd
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/generate.psd
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/generation.png b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/generation.png
index 6a55c438352..6a55c438352 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/generation.png
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/generation.png
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/sample.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/sample.gif
index 34fb3c9d8cb..34fb3c9d8cb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/sample.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/icons/sample.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/plugin.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/plugin.properties
index 41b9da94450..41b9da94450 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/plugin.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/plugin.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/pom.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/pom.xml
index 54392113517..9361e773d27 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/pom.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.jdtsynchronizer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/GeneratorPreference.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/GeneratorPreference.java
index 56af682c908..56af682c908 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/GeneratorPreference.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/GeneratorPreference.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/RunGenerator.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/RunGenerator.java
index 4ff03a7e505..4ff03a7e505 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/RunGenerator.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/RunGenerator.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTCommentable.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTCommentable.java
index 5a196a155b0..5a196a155b0 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTCommentable.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTCommentable.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTCompilationUnit.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTCompilationUnit.java
index 1e6f34fb515..1e6f34fb515 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTCompilationUnit.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTCompilationUnit.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTField.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTField.java
index 485ef9ce603..485ef9ce603 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTField.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTField.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTGetterSetter.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTGetterSetter.java
index b1939423c7c..b1939423c7c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTGetterSetter.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTGetterSetter.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTJavaModel.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTJavaModel.java
index 7dc71d9ccef..7dc71d9ccef 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTJavaModel.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTJavaModel.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTJavaProject.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTJavaProject.java
index fa545843b69..fa545843b69 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTJavaProject.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTJavaProject.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTMethod.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTMethod.java
index f7b07b36d9c..f7b07b36d9c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTMethod.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTMethod.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragment.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragment.java
index 7426838392c..7426838392c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragment.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragment.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragmentRoot.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragmentRoot.java
index cf023088416..cf023088416 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragmentRoot.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragmentRoot.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTType.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTType.java
index 7d9560f1cc7..7d9560f1cc7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTType.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchJDTType.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchTools.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchTools.java
index 89a4d4a586d..89a4d4a586d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchTools.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/java/generator/jdtsynchronizer/impl/SynchTools.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.project
index 0288cbb8ed8..0288cbb8ed8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/META-INF/MANIFEST.MF
index 22a5ba0c5dc..22a5ba0c5dc 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/META-INF/MANIFEST.MF
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/build.properties
index b686a6bcfc4..b686a6bcfc4 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTClass.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTClass.gif
index 5b6f7bd4d41..5b6f7bd4d41 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTClass.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTClass.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTEnum.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTEnum.gif
index b7364612037..b7364612037 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTEnum.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTEnum.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTInterface.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTInterface.gif
index fb66338ebff..fb66338ebff 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTInterface.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTInterface.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTType.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTType.gif
index f7c61c23bbd..f7c61c23bbd 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTType.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTType.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaModel_javaProject_JDTJavaProject.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaModel_javaProject_JDTJavaProject.gif
index 41c86b3dbc1..41c86b3dbc1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaModel_javaProject_JDTJavaProject.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaModel_javaProject_JDTJavaProject.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaProject_packageFragmentRoots_JDTPackageFragmentRoot.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaProject_packageFragmentRoots_JDTPackageFragmentRoot.gif
index 07adaab9f3a..07adaab9f3a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaProject_packageFragmentRoots_JDTPackageFragmentRoot.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaProject_packageFragmentRoots_JDTPackageFragmentRoot.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMember_typeParameters_JDTTypeParameter.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMember_typeParameters_JDTTypeParameter.gif
index c3c4510a051..c3c4510a051 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMember_typeParameters_JDTTypeParameter.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMember_typeParameters_JDTTypeParameter.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_JDTOpaqueBody.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_JDTOpaqueBody.gif
index e5d4d731cc6..e5d4d731cc6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_JDTOpaqueBody.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_JDTOpaqueBody.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_OpaqueMethodBody.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_OpaqueMethodBody.gif
index d5f8c8dbcfb..d5f8c8dbcfb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_OpaqueMethodBody.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_OpaqueMethodBody.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_parameters_JDTParameter.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_parameters_JDTParameter.gif
index d7724b60a25..d7724b60a25 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_parameters_JDTParameter.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_parameters_JDTParameter.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_returnType_JDTParameter.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_returnType_JDTParameter.gif
index d7724b60a25..d7724b60a25 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_returnType_JDTParameter.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_returnType_JDTParameter.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragmentRoot_packageFragments_JDTPackageFragment.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragmentRoot_packageFragments_JDTPackageFragment.gif
index 932fde3646a..932fde3646a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragmentRoot_packageFragments_JDTPackageFragment.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragmentRoot_packageFragments_JDTPackageFragment.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_compilationUnits_JDTCompilationUnit.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_compilationUnits_JDTCompilationUnit.gif
index 953143344d9..953143344d9 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_compilationUnits_JDTCompilationUnit.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_compilationUnits_JDTCompilationUnit.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_packageFragments_JDTPackageFragment.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_packageFragments_JDTPackageFragment.gif
index df3eebc9432..df3eebc9432 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_packageFragments_JDTPackageFragment.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_packageFragments_JDTPackageFragment.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_fields_JDTField.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_fields_JDTField.gif
index 2c2ef1ff95c..2c2ef1ff95c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_fields_JDTField.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_fields_JDTField.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_methods_JDTMethod.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_methods_JDTMethod.gif
index a64a033a18c..a64a033a18c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_methods_JDTMethod.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_methods_JDTMethod.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTClass.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTClass.gif
index e5f323d1f47..e5f323d1f47 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTClass.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTClass.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTEnum.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTEnum.gif
index a6e5cfd32c1..a6e5cfd32c1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTEnum.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTEnum.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTInterface.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTInterface.gif
index 2f6d3eba40f..2f6d3eba40f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTInterface.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTInterface.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTType.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTType.gif
index 11148cf465f..11148cf465f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTType.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTType.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTClass.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTClass.gif
index 10d222998af..10d222998af 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTClass.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTClass.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTCompilationUnit.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTCompilationUnit.gif
index 05dc74ad5da..05dc74ad5da 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTCompilationUnit.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTCompilationUnit.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTEnum.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTEnum.gif
index ed874747401..ed874747401 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTEnum.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTEnum.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTException.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTException.gif
index c4fb30e9687..c4fb30e9687 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTException.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTException.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTField.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTField.gif
index 1e5345fb323..1e5345fb323 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTField.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTField.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportContainer.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportContainer.gif
index 53500daf98e..53500daf98e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportContainer.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportContainer.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportDeclaration.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportDeclaration.gif
index d3dc5a9ad81..d3dc5a9ad81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportDeclaration.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportDeclaration.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTInterface.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTInterface.gif
index c3370c7ddd5..c3370c7ddd5 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTInterface.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTInterface.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaElement.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaElement.gif
index 94c953e013b..94c953e013b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaElement.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaElement.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaModel.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaModel.gif
index 4365960a04b..4365960a04b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaModel.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaModel.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaProject.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaProject.gif
index a26660ec28f..a26660ec28f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaProject.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaProject.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTMethod.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTMethod.gif
index 30f0c48da8d..30f0c48da8d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTMethod.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTMethod.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTOpaqueBody.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTOpaqueBody.gif
index 5a9bc7514fa..5a9bc7514fa 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTOpaqueBody.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTOpaqueBody.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragment.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragment.gif
index c414fe9f728..c414fe9f728 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragment.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragment.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragmentRoot.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragmentRoot.gif
index 48e3cf22687..48e3cf22687 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragmentRoot.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragmentRoot.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTParameter.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTParameter.gif
index 7c2aaac84ee..7c2aaac84ee 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTParameter.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTParameter.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTTypeParameter.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTTypeParameter.gif
index 94c953e013b..94c953e013b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTTypeParameter.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTTypeParameter.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/OpaqueMethodBody.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/OpaqueMethodBody.gif
index 98b351f1c44..98b351f1c44 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/OpaqueMethodBody.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/OpaqueMethodBody.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/Options.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/Options.gif
index cdd3b76e3c0..cdd3b76e3c0 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/Options.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/icons/full/obj16/Options.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/plugin.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/plugin.properties
index 2f93b958827..2f93b958827 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/plugin.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/plugin.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/plugin.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/plugin.xml
index df8624cdbb7..df8624cdbb7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/plugin.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/plugin.xml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/pom.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/pom.xml
index 13f198963fe..15615586c14 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/pom.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.metamodel.jdt.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmEditPlugin.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmEditPlugin.java
index 3e8e80040f5..3e8e80040f5 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmEditPlugin.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmEditPlugin.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmItemProviderAdapterFactory.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmItemProviderAdapterFactory.java
index 88634641cf3..88634641cf3 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmItemProviderAdapterFactory.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmItemProviderAdapterFactory.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/OptionsItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/OptionsItemProvider.java
index 57d2268c2de..57d2268c2de 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/OptionsItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/provider/OptionsItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTClassItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTClassItemProvider.java
index a0298c0858e..a0298c0858e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTClassItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTClassItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTCompilationUnitItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTCompilationUnitItemProvider.java
index 6f0ec9edd1c..6f0ec9edd1c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTCompilationUnitItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTCompilationUnitItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTEnumItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTEnumItemProvider.java
index 03cc577662b..03cc577662b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTEnumItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTEnumItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTExceptionItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTExceptionItemProvider.java
index 7425bf22b7a..7425bf22b7a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTExceptionItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTExceptionItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTFieldItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTFieldItemProvider.java
index 06ce121e867..06ce121e867 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTFieldItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTFieldItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTImportContainerItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTImportContainerItemProvider.java
index db59b9cf788..db59b9cf788 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTImportContainerItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTImportContainerItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTImportDeclarationItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTImportDeclarationItemProvider.java
index 00b887558c4..00b887558c4 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTImportDeclarationItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTImportDeclarationItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTInterfaceItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTInterfaceItemProvider.java
index 53afb9f522a..53afb9f522a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTInterfaceItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTInterfaceItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaElementItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaElementItemProvider.java
index 3b3ae3d9dab..3b3ae3d9dab 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaElementItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaElementItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaModelItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaModelItemProvider.java
index 3c1c389f517..3c1c389f517 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaModelItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaModelItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaProjectItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaProjectItemProvider.java
index f1c6006b642..f1c6006b642 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaProjectItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaProjectItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMemberItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMemberItemProvider.java
index 28301611c75..28301611c75 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMemberItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMemberItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodBodyItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodBodyItemProvider.java
index 6e2cc034d23..6e2cc034d23 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodBodyItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodBodyItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodItemProvider.java
index c99f0c834ec..c99f0c834ec 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTOpaqueBodyItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTOpaqueBodyItemProvider.java
index 4f60a443ca8..4f60a443ca8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTOpaqueBodyItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTOpaqueBodyItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentItemProvider.java
index 105e8771d7a..105e8771d7a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentRootItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentRootItemProvider.java
index 422c5ef7803..422c5ef7803 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentRootItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentRootItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParameterItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParameterItemProvider.java
index 5b752d26f95..5b752d26f95 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParameterItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParameterItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParentItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParentItemProvider.java
index 86e1fbe2a9f..86e1fbe2a9f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParentItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParentItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParentJavaElementItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParentJavaElementItemProvider.java
index 069b6c12c76..069b6c12c76 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParentJavaElementItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTParentJavaElementItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeItemProvider.java
index 7a99105e5a1..7a99105e5a1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeParameterItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeParameterItemProvider.java
index 855887da62c..855887da62c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeParameterItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeParameterItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeRootItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeRootItemProvider.java
index 8863ab761cf..8863ab761cf 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeRootItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeRootItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JdtmmEditPlugin.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JdtmmEditPlugin.java
index 3dd25b4756d..3dd25b4756d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JdtmmEditPlugin.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JdtmmEditPlugin.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JdtmmItemProviderAdapterFactory.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JdtmmItemProviderAdapterFactory.java
index 406acea650c..406acea650c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JdtmmItemProviderAdapterFactory.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/provider/JdtmmItemProviderAdapterFactory.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.project
index 3d0615d9665..3d0615d9665 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/META-INF/MANIFEST.MF
index 14f61d6d866..14f61d6d866 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/META-INF/MANIFEST.MF
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/build.properties
index f4610251623..f4610251623 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/icons/full/obj16/JdtmmModelFile.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/icons/full/obj16/JdtmmModelFile.gif
index a99fd8140c4..a99fd8140c4 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/icons/full/obj16/JdtmmModelFile.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/icons/full/obj16/JdtmmModelFile.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/icons/full/wizban/NewJdtmm.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/icons/full/wizban/NewJdtmm.gif
index 897c9baa83c..897c9baa83c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/icons/full/wizban/NewJdtmm.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/icons/full/wizban/NewJdtmm.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/plugin.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/plugin.properties
index e799174fb7c..e799174fb7c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/plugin.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/plugin.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/plugin.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/plugin.xml
index 811f7e9bc6f..811f7e9bc6f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/plugin.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/plugin.xml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/pom.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/pom.xml
index 6d65def46cb..fe4b79411ab 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/pom.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.metamodel.jdt.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmActionBarContributor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmActionBarContributor.java
index ba68a1509a8..ba68a1509a8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmActionBarContributor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmActionBarContributor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditor.java
index 61e6583d63e..61e6583d63e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditorPlugin.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditorPlugin.java
index b9c5d54c04b..b9c5d54c04b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditorPlugin.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditorPlugin.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmModelWizard.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmModelWizard.java
index 0eaf5624b1a..0eaf5624b1a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmModelWizard.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmModelWizard.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmActionBarContributor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmActionBarContributor.java
index e86713e1c5d..e86713e1c5d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmActionBarContributor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmActionBarContributor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmEditor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmEditor.java
index fa9eb69be34..fa9eb69be34 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmEditor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmEditor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmEditorPlugin.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmEditorPlugin.java
index 399c138dfb8..399c138dfb8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmEditorPlugin.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmEditorPlugin.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmModelWizard.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmModelWizard.java
index 3b0642514e6..3b0642514e6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmModelWizard.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/presentation/JdtmmModelWizard.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.project
index 6da221b42e4..6da221b42e4 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/META-INF/MANIFEST.MF
index 09af16320e6..09af16320e6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/META-INF/MANIFEST.MF
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/build.properties
index 90dc876dc50..90dc876dc50 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.di b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.di
index bf9abab340f..bf9abab340f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.di
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.di
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.ecore b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.ecore
index 94f441e8179..94f441e8179 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.ecore
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.ecore
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.genmodel b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.genmodel
index 185bb8cd48b..185bb8cd48b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.genmodel
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.genmodel
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.notation b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.notation
index b9668edc339..b9668edc339 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.notation
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.notation
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.uml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.uml
index 984402e4517..984402e4517 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.uml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/generatorOptions/generatoroptionsmm.uml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.di b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.di
index 2ad562c2abc..2ad562c2abc 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.di
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.di
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.ecore b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.ecore
index 8d8c40c7c1b..8d8c40c7c1b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.ecore
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.ecore
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.genmodel b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.genmodel
index 5661529e011..5661529e011 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.genmodel
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.genmodel
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.notation b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.notation
index a43c9740861..a43c9740861 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.notation
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.notation
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.uml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.uml
index 30b14aa8114..30b14aa8114 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.uml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/jdtmm.uml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.di b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.di
index 9084770dd56..9084770dd56 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.di
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.di
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.notation b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.notation
index 73830701e82..73830701e82 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.notation
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.notation
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.uml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.uml
index 0421e23299d..0421e23299d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.uml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/model/reverse/reverseJDT.uml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/plugin.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/plugin.properties
index 0a19e739f6a..0a19e739f6a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/plugin.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/plugin.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/plugin.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/plugin.xml
index 1d95f211dfb..1d95f211dfb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/plugin.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/plugin.xml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/pom.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/pom.xml
index dad8ca33821..8fd67e862bf 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/pom.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.metamodel.jdt</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/GeneratoroptionsmmFactory.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/GeneratoroptionsmmFactory.java
index 574aafc167a..574aafc167a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/GeneratoroptionsmmFactory.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/GeneratoroptionsmmFactory.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/GeneratoroptionsmmPackage.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/GeneratoroptionsmmPackage.java
index d67b1c8d5b3..d67b1c8d5b3 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/GeneratoroptionsmmPackage.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/GeneratoroptionsmmPackage.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/Options.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/Options.java
index d2940a2afc6..d2940a2afc6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/Options.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/Options.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/GeneratoroptionsmmFactoryImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/GeneratoroptionsmmFactoryImpl.java
index 04e8b13c3c9..04e8b13c3c9 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/GeneratoroptionsmmFactoryImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/GeneratoroptionsmmFactoryImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/GeneratoroptionsmmPackageImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/GeneratoroptionsmmPackageImpl.java
index 1ff4792db08..1ff4792db08 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/GeneratoroptionsmmPackageImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/GeneratoroptionsmmPackageImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/OptionsImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/OptionsImpl.java
index da0c05436b7..da0c05436b7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/OptionsImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/impl/OptionsImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/util/GeneratoroptionsmmAdapterFactory.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/util/GeneratoroptionsmmAdapterFactory.java
index b3559f01418..b3559f01418 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/util/GeneratoroptionsmmAdapterFactory.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/util/GeneratoroptionsmmAdapterFactory.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/util/GeneratoroptionsmmSwitch.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/util/GeneratoroptionsmmSwitch.java
index e4b8935cc3a..e4b8935cc3a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/util/GeneratoroptionsmmSwitch.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/generatoroptionsmm/util/GeneratoroptionsmmSwitch.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTClass.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTClass.java
index 2479b25ad4e..2479b25ad4e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTClass.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTClass.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTCompilationUnit.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTCompilationUnit.java
index c9cace0f946..c9cace0f946 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTCompilationUnit.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTCompilationUnit.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTEnum.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTEnum.java
index 2a762c988be..2a762c988be 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTEnum.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTEnum.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTException.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTException.java
index bb72424f0f7..bb72424f0f7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTException.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTException.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTField.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTField.java
index 39c29010ee8..39c29010ee8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTField.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTField.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTImportContainer.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTImportContainer.java
index 44e4feeb27b..44e4feeb27b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTImportContainer.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTImportContainer.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTImportDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTImportDeclaration.java
index 31f45b7481a..31f45b7481a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTImportDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTImportDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTInterface.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTInterface.java
index 140bba30001..140bba30001 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTInterface.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTInterface.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaElement.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaElement.java
index d928b385700..d928b385700 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaElement.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaElement.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaModel.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaModel.java
index 825af4b4dd9..825af4b4dd9 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaModel.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaModel.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaProject.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaProject.java
index 02d6e63656a..02d6e63656a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaProject.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTJavaProject.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMember.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMember.java
index eacd3ae38fd..eacd3ae38fd 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMember.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMember.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMethod.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMethod.java
index 3b9910e6807..3b9910e6807 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMethod.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMethod.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMethodBody.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMethodBody.java
index 970acbffbcd..970acbffbcd 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMethodBody.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTMethodBody.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTOpaqueBody.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTOpaqueBody.java
index 9e6d2280f01..9e6d2280f01 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTOpaqueBody.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTOpaqueBody.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTPackageFragment.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTPackageFragment.java
index fbf0e3ab93d..fbf0e3ab93d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTPackageFragment.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTPackageFragment.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTPackageFragmentRoot.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTPackageFragmentRoot.java
index 2b34e6990de..2b34e6990de 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTPackageFragmentRoot.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTPackageFragmentRoot.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParameter.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParameter.java
index 7e23a137536..7e23a137536 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParameter.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParameter.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParent.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParent.java
index 273a3cad656..273a3cad656 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParent.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParent.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParentJavaElement.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParentJavaElement.java
index c64fd494880..c64fd494880 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParentJavaElement.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTParentJavaElement.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTType.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTType.java
index 8b83fef2790..8b83fef2790 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTType.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTType.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTTypeParameter.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTTypeParameter.java
index 0b417a44a06..0b417a44a06 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTTypeParameter.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTTypeParameter.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTTypeRoot.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTTypeRoot.java
index daffc8a54d7..daffc8a54d7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTTypeRoot.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JDTTypeRoot.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JdtmmFactory.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JdtmmFactory.java
index e257924008d..e257924008d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JdtmmFactory.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JdtmmFactory.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JdtmmPackage.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JdtmmPackage.java
index f69bbbaaebd..f69bbbaaebd 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JdtmmPackage.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/JdtmmPackage.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/TrueFalseDefault.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/TrueFalseDefault.java
index dae01bcc8c7..dae01bcc8c7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/TrueFalseDefault.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/TrueFalseDefault.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/VisibilityKind.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/VisibilityKind.java
index 7297efd22a2..7297efd22a2 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/VisibilityKind.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/VisibilityKind.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTClassImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTClassImpl.java
index db43f78bd57..db43f78bd57 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTClassImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTClassImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTCompilationUnitImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTCompilationUnitImpl.java
index d01d7d3bd83..d01d7d3bd83 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTCompilationUnitImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTCompilationUnitImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTEnumImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTEnumImpl.java
index 22e94d54f07..22e94d54f07 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTEnumImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTEnumImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTExceptionImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTExceptionImpl.java
index dccb6aa5f6d..dccb6aa5f6d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTExceptionImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTExceptionImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTFieldImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTFieldImpl.java
index 4e99b219be8..4e99b219be8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTFieldImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTFieldImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTImportContainerImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTImportContainerImpl.java
index 778b6c46e40..778b6c46e40 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTImportContainerImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTImportContainerImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTImportDeclarationImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTImportDeclarationImpl.java
index 3312ffe75ba..3312ffe75ba 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTImportDeclarationImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTImportDeclarationImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTInterfaceImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTInterfaceImpl.java
index 289b0d528bf..289b0d528bf 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTInterfaceImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTInterfaceImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaElementImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaElementImpl.java
index cb4cdf8284e..cb4cdf8284e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaElementImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaElementImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaModelImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaModelImpl.java
index ac4c2ac89db..ac4c2ac89db 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaModelImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaModelImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaProjectImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaProjectImpl.java
index a085e987b2d..a085e987b2d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaProjectImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTJavaProjectImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMemberImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMemberImpl.java
index 281a07e2051..281a07e2051 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMemberImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMemberImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMethodBodyImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMethodBodyImpl.java
index 9cc13471a7c..9cc13471a7c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMethodBodyImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMethodBodyImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMethodImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMethodImpl.java
index 59aabb752f5..59aabb752f5 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMethodImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTMethodImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTOpaqueBodyImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTOpaqueBodyImpl.java
index 13f1b15dd2b..13f1b15dd2b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTOpaqueBodyImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTOpaqueBodyImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTPackageFragmentImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTPackageFragmentImpl.java
index d3eff0ac3cb..d3eff0ac3cb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTPackageFragmentImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTPackageFragmentImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTPackageFragmentRootImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTPackageFragmentRootImpl.java
index 07c30c7406f..07c30c7406f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTPackageFragmentRootImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTPackageFragmentRootImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParameterImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParameterImpl.java
index 587f6e113d2..587f6e113d2 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParameterImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParameterImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParentImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParentImpl.java
index 6307b67f243..6307b67f243 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParentImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParentImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParentJavaElementImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParentJavaElementImpl.java
index 7a45658d162..7a45658d162 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParentJavaElementImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTParentJavaElementImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeImpl.java
index 554572a55be..554572a55be 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeParameterImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeParameterImpl.java
index 0f11bdd4e26..0f11bdd4e26 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeParameterImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeParameterImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeRootImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeRootImpl.java
index feab7e6748f..feab7e6748f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeRootImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JDTTypeRootImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JdtmmFactoryImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JdtmmFactoryImpl.java
index 9a567bb769e..9a567bb769e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JdtmmFactoryImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JdtmmFactoryImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JdtmmPackageImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JdtmmPackageImpl.java
index 3050ecf23e4..3050ecf23e4 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JdtmmPackageImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/impl/JdtmmPackageImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmAdapterFactory.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmAdapterFactory.java
index aa76f9d5313..aa76f9d5313 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmAdapterFactory.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmAdapterFactory.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmPreference.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmPreference.java
index 71f10f9be80..71f10f9be80 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmPreference.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmPreference.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmSwitch.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmSwitch.java
index 54c63e6116d..54c63e6116d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmSwitch.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/util/JdtmmSwitch.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/visitor/JDTVisitor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/visitor/JDTVisitor.java
index 96f258be762..96f258be762 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/visitor/JDTVisitor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/visitor/JDTVisitor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/visitor/JDTVisitorException.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/visitor/JDTVisitorException.java
index d2d1d0b8ae8..d2d1d0b8ae8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/visitor/JDTVisitorException.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/jdtmm/visitor/JDTVisitorException.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/utils/DerivedNotifyingEList.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/utils/DerivedNotifyingEList.java
index 6f5bdd9b327..6f5bdd9b327 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/utils/DerivedNotifyingEList.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt/src/org/eclipse/papyrus/java/generator/metamodel/jdt/utils/DerivedNotifyingEList.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.project
index 42aed9bd201..42aed9bd201 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF
index e126b18f3b0..e126b18f3b0 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/build.properties
index 60a87c754ae..60a87c754ae 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.di b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.di
index 9d143f73599..9d143f73599 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.di
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.di
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.notation b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.notation
index 08d0a52ccd9..08d0a52ccd9 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.notation
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.notation
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.uml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.uml
index dda3161236d..dda3161236d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.uml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/doc/rulesInheritance.uml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/plugin.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/plugin.properties
index 7d387085329..7d387085329 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/plugin.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/plugin.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/pom.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/pom.xml
index c699cf62b22..73c69ddba04 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/pom.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.transfo.umltojdt</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/src/org/eclipse/papyrus/java/generator/transfo/umltojdt/UmltojdtActivator.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/src/org/eclipse/papyrus/java/generator/transfo/umltojdt/UmltojdtActivator.java
index d4160d94245..d4160d94245 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/src/org/eclipse/papyrus/java/generator/transfo/umltojdt/UmltojdtActivator.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/src/org/eclipse/papyrus/java/generator/transfo/umltojdt/UmltojdtActivator.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/algo.txt b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/algo.txt
index bdcd72a922b..bdcd72a922b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/algo.txt
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/algo.txt
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/stereotypeUtil.qvto b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/stereotypeUtil.qvto
index 98c70005c93..98c70005c93 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/stereotypeUtil.qvto
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/stereotypeUtil.qvto
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/uml2jdt2.qvto b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/uml2jdt2.qvto
index e2a43a4cf6e..e2a43a4cf6e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/uml2jdt2.qvto
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/transforms/uml/uml2jdt2.qvto
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/.classpath
index 8a8f1668cdc..8a8f1668cdc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/.project
index 4f0ff984c7b..4f0ff984c7b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF
index b5234389f4e..b5234389f4e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/build.properties
index 7915e442db0..7915e442db0 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/icons/generate.psd b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/icons/generate.psd
index 9a555a938e1..9a555a938e1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/icons/generate.psd
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/icons/generate.psd
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/icons/generation.png b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/icons/generation.png
index 6a55c438352..6a55c438352 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/icons/generation.png
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/icons/generation.png
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/icons/sample.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/icons/sample.gif
index 34fb3c9d8cb..34fb3c9d8cb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/icons/sample.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/icons/sample.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/plugin.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/plugin.properties
index c561698838c..c561698838c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/plugin.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/plugin.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/plugin.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/plugin.xml
index 4a4fdf7e6a6..4a4fdf7e6a6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/plugin.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/plugin.xml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/pom.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/pom.xml
index 87e2b7faa1c..ac1f67981b8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/pom.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/Activator.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/Activator.java
index bf812d8fb4e..bf812d8fb4e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/Activator.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/Activator.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/handlers/GenerateJavaCodeHandler.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/handlers/GenerateJavaCodeHandler.java
index 5adfd0698df..5adfd0698df 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/handlers/GenerateJavaCodeHandler.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/handlers/GenerateJavaCodeHandler.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GeneratorPreferenceImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GeneratorPreferenceImpl.java
index 4b781af05c2..4b781af05c2 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GeneratorPreferenceImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GeneratorPreferenceImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GenericClassFieldEditor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GenericClassFieldEditor.java
index 61abda9df3c..61abda9df3c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GenericClassFieldEditor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GenericClassFieldEditor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PackageListEditor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PackageListEditor.java
index 20c81ae56e7..20c81ae56e7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PackageListEditor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PackageListEditor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferenceConstants.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferenceConstants.java
index 674c6f07c68..674c6f07c68 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferenceConstants.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferenceConstants.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferenceInitializer.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferenceInitializer.java
index 5bbb763db45..5bbb763db45 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferenceInitializer.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferenceInitializer.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferencePage.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferencePage.java
index 626d3a8f871..626d3a8f871 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferencePage.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PreferencePage.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/.project
index f1c67ae603d..f1c67ae603d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/META-INF/MANIFEST.MF
index e2c700d5d7d..e2c700d5d7d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/META-INF/MANIFEST.MF
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/build.properties
index 890b147293b..890b147293b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaClass.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaClass.gif
index 134551bff7e..134551bff7e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaClass.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaClass.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaMethod.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaMethod.gif
index b3643da048a..b3643da048a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaMethod.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaMethod.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaPackage_.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaPackage_.gif
index e4b530eca17..e4b530eca17 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaPackage_.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaPackage_.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaParameter.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaParameter.gif
index 10d222998af..10d222998af 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaParameter.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaParameter.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaProject.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaProject.gif
index badaab0664a..badaab0664a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaProject.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaProject.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaProperty.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaProperty.gif
index 33854e98c25..33854e98c25 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaProperty.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaProperty.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaSrcFolder.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaSrcFolder.gif
index 98b351f1c44..98b351f1c44 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaSrcFolder.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/JavaSrcFolder.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/PrimitiveType.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/PrimitiveType.gif
index 35ef84e20e2..35ef84e20e2 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/PrimitiveType.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/icons/full/obj16/PrimitiveType.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/plugin.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/plugin.properties
index dfb7e79f433..dfb7e79f433 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/plugin.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/plugin.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/plugin.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/plugin.xml
index 24301c02945..24301c02945 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/plugin.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/plugin.xml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/pom.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/pom.xml
index f3c1c3f0cae..6e00e35bf8c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/pom.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.profile.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaClassItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaClassItemProvider.java
index 5bc9f8a6b1b..5bc9f8a6b1b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaClassItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaClassItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaEditPlugin.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaEditPlugin.java
index f0cbef55544..f0cbef55544 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaEditPlugin.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaEditPlugin.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaGenItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaGenItemProvider.java
index b17fd0fa212..b17fd0fa212 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaGenItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaGenItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaItemProviderAdapterFactory.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaItemProviderAdapterFactory.java
index 9b126fc37ee..9b126fc37ee 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaItemProviderAdapterFactory.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaItemProviderAdapterFactory.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaMethodItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaMethodItemProvider.java
index c30e779e6aa..c30e779e6aa 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaMethodItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaMethodItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaNamedElementItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaNamedElementItemProvider.java
index 9f0a4b9e6e1..9f0a4b9e6e1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaNamedElementItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaNamedElementItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaPackage_ItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaPackage_ItemProvider.java
index 3220ea94e6d..3220ea94e6d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaPackage_ItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaPackage_ItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaParameterItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaParameterItemProvider.java
index 006b8d41606..006b8d41606 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaParameterItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaParameterItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaProjectItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaProjectItemProvider.java
index 3fafb280255..3fafb280255 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaProjectItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaProjectItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaPropertyItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaPropertyItemProvider.java
index 4d3b1342181..4d3b1342181 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaPropertyItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaPropertyItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaSrcFolderItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaSrcFolderItemProvider.java
index 524bcd7e059..524bcd7e059 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaSrcFolderItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/JavaSrcFolderItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/PrimitiveTypeItemProvider.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/PrimitiveTypeItemProvider.java
index 1ec2a9c9a48..1ec2a9c9a48 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/PrimitiveTypeItemProvider.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit/src/org/eclipse/papyrus/java/profile/java/provider/PrimitiveTypeItemProvider.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/.project
index b093010c682..b093010c682 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/META-INF/MANIFEST.MF
index 4406bae6a12..4406bae6a12 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/META-INF/MANIFEST.MF
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/build.properties
index e0979c7d60f..e0979c7d60f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/icons/full/obj16/JavaModelFile.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/icons/full/obj16/JavaModelFile.gif
index 53eb7d4f381..53eb7d4f381 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/icons/full/obj16/JavaModelFile.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/icons/full/obj16/JavaModelFile.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/icons/full/wizban/NewJava.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/icons/full/wizban/NewJava.gif
index 5306a816d4c..5306a816d4c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/icons/full/wizban/NewJava.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/icons/full/wizban/NewJava.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/plugin.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/plugin.properties
index f21e2f2baf8..f21e2f2baf8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/plugin.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/plugin.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/plugin.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/plugin.xml
index 83b63b9cb2c..83b63b9cb2c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/plugin.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/plugin.xml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/pom.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/pom.xml
index d43f0b0275a..bc9d1af8099 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/pom.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.profile.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaActionBarContributor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaActionBarContributor.java
index f73a9c3c7a1..f73a9c3c7a1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaActionBarContributor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaActionBarContributor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaEditor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaEditor.java
index 4ac8d8e0bc8..4ac8d8e0bc8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaEditor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaEditor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaEditorPlugin.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaEditorPlugin.java
index 9db89df6630..9db89df6630 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaEditorPlugin.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaEditorPlugin.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaModelWizard.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaModelWizard.java
index 8a22e9e9187..8a22e9e9187 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaModelWizard.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor/src/org/eclipse/papyrus/java/profile/java/presentation/JavaModelWizard.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/.project
index f90e9a5b55b..f90e9a5b55b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/META-INF/MANIFEST.MF
index 1cd3c3071ad..1cd3c3071ad 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/META-INF/MANIFEST.MF
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/build.properties
index a3690e680da..a3690e680da 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/icons/javaprofile.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/icons/javaprofile.gif
index 34fb3c9d8cb..34fb3c9d8cb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/icons/javaprofile.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/icons/javaprofile.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/models/java.ecore b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/models/java.ecore
index f2ce423a3eb..f2ce423a3eb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/models/java.ecore
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/models/java.ecore
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/models/java.profile.di b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/models/java.profile.di
index 61e2f6a31f3..61e2f6a31f3 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/models/java.profile.di
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/models/java.profile.di
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/models/java.profile.genmodel b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/models/java.profile.genmodel
index c2f4684879d..c2f4684879d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/models/java.profile.genmodel
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/models/java.profile.genmodel
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/models/java.profile.notation b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/models/java.profile.notation
index a5335966efb..a5335966efb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/models/java.profile.notation
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/models/java.profile.notation
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/models/java.profile.uml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/models/java.profile.uml
index 9aff0b63659..9aff0b63659 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/models/java.profile.uml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/models/java.profile.uml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/plugin.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/plugin.properties
index bc49c812cb7..bc49c812cb7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/plugin.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/plugin.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/plugin.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/plugin.xml
index 9ebf9f7c10b..9ebf9f7c10b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/plugin.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/plugin.xml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/pom.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/pom.xml
index 2c76b0c8d93..4a12fdfdbb7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/pom.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaClass.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaClass.java
index 86b0fc45fd6..86b0fc45fd6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaClass.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaClass.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaFactory.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaFactory.java
index 6adbd7ca301..6adbd7ca301 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaFactory.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaFactory.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaGen.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaGen.java
index a4342630684..a4342630684 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaGen.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaGen.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaMethod.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaMethod.java
index b0230672d39..b0230672d39 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaMethod.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaMethod.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaNamedElement.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaNamedElement.java
index 0ae050419d3..0ae050419d3 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaNamedElement.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaNamedElement.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaPackage.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaPackage.java
index 32e0cda8c6a..32e0cda8c6a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaPackage.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaPackage.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaPackage_.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaPackage_.java
index 72f5dd43ebc..72f5dd43ebc 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaPackage_.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaPackage_.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaParameter.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaParameter.java
index 788372013f5..788372013f5 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaParameter.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaParameter.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaProject.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaProject.java
index 122301f6388..122301f6388 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaProject.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaProject.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaProperty.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaProperty.java
index 7ddf1e1bff6..7ddf1e1bff6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaProperty.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaProperty.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaSrcFolder.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaSrcFolder.java
index 25bf1c52ed5..25bf1c52ed5 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaSrcFolder.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/JavaSrcFolder.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/PrimitiveType.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/PrimitiveType.java
index 00d52854f23..00d52854f23 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/PrimitiveType.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/PrimitiveType.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/TrueFalseDefault.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/TrueFalseDefault.java
index 99d15305e4e..99d15305e4e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/TrueFalseDefault.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/TrueFalseDefault.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaClassImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaClassImpl.java
index d6dc2b051f1..d6dc2b051f1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaClassImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaClassImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaFactoryImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaFactoryImpl.java
index 815339c6983..815339c6983 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaFactoryImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaFactoryImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaGenImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaGenImpl.java
index d9fb5127c2b..d9fb5127c2b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaGenImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaGenImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaMethodImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaMethodImpl.java
index ba74887b921..ba74887b921 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaMethodImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaMethodImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaNamedElementImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaNamedElementImpl.java
index f3876cd8961..f3876cd8961 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaNamedElementImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaNamedElementImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPackageImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPackageImpl.java
index c692fe3aa4f..c692fe3aa4f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPackageImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPackageImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPackage_Impl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPackage_Impl.java
index 845bb0e70d8..845bb0e70d8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPackage_Impl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPackage_Impl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaParameterImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaParameterImpl.java
index e554cd837cc..e554cd837cc 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaParameterImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaParameterImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaProjectImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaProjectImpl.java
index 7c356b1ec6a..7c356b1ec6a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaProjectImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaProjectImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPropertyImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPropertyImpl.java
index e1214355ae8..e1214355ae8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPropertyImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaPropertyImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaSrcFolderImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaSrcFolderImpl.java
index e52396f2794..e52396f2794 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaSrcFolderImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/JavaSrcFolderImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/PrimitiveTypeImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/PrimitiveTypeImpl.java
index 45fa400b2ee..45fa400b2ee 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/PrimitiveTypeImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/impl/PrimitiveTypeImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaAdapterFactory.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaAdapterFactory.java
index 5e966089922..5e966089922 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaAdapterFactory.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaAdapterFactory.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaResourceFactoryImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaResourceFactoryImpl.java
index 38cc336adf6..38cc336adf6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaResourceFactoryImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaResourceFactoryImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaResourceImpl.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaResourceImpl.java
index 6f18c504479..6f18c504479 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaResourceImpl.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaResourceImpl.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaSwitch.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaSwitch.java
index 85d4994bcb2..85d4994bcb2 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaSwitch.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaSwitch.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaXMLProcessor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaXMLProcessor.java
index 117391bb1f6..117391bb1f6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaXMLProcessor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile/src/org/eclipse/papyrus/java/profile/java/util/JavaXMLProcessor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/.project
index 6456ba27df1..6456ba27df1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.core.resources.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.core.resources.prefs
index 2697efedfa3..2697efedfa3 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.core.resources.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF
index b24c01b97bd..b24c01b97bd 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/build.properties
index 1dc01a0a02a..1dc01a0a02a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/icons/associationFromProperty.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/icons/associationFromProperty.gif
index b4fbec9c849..b4fbec9c849 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/icons/associationFromProperty.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/icons/associationFromProperty.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/icons/javaReverse.gif b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/icons/javaReverse.gif
index 68d40f7e2d5..68d40f7e2d5 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/icons/javaReverse.gif
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/icons/javaReverse.gif
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/plugin.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/plugin.properties
index fba264cf201..fba264cf201 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/plugin.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/plugin.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/plugin.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/plugin.xml
index 6e744e206e8..6e744e206e8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/plugin.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/plugin.xml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/pom.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/pom.xml
index 6d3e48ae13f..1d28d2448a1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/pom.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.reverse.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/Activator.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/Activator.java
index 2ac94758559..2ac94758559 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/Activator.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/Activator.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DisplayReverse.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DisplayReverse.java
index caac0a8c995..caac0a8c995 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DisplayReverse.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DisplayReverse.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DndReverseCodeHandler.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DndReverseCodeHandler.java
index 5c5568282c7..5c5568282c7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DndReverseCodeHandler.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DndReverseCodeHandler.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/JavaCodeReverse.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/JavaCodeReverse.java
index a9190952dcc..a9190952dcc 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/JavaCodeReverse.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/JavaCodeReverse.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/Messages.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/Messages.java
index 38577506c0d..38577506c0d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/Messages.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/Messages.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/ReverseCodeHandler.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/ReverseCodeHandler.java
index 433344eba35..433344eba35 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/ReverseCodeHandler.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/ReverseCodeHandler.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/TreeSelectionList.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/TreeSelectionList.java
index 370a9c0319e..370a9c0319e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/TreeSelectionList.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/TreeSelectionList.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/DndReverseCodeDialog.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/DndReverseCodeDialog.java
index 05180af829d..05180af829d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/DndReverseCodeDialog.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/DndReverseCodeDialog.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/InputListDialog.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/InputListDialog.java
index f8c4fd0a58e..f8c4fd0a58e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/InputListDialog.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/InputListDialog.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/ReverseCodeDialog.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/ReverseCodeDialog.java
index d21b20de12d..d21b20de12d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/ReverseCodeDialog.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dialog/ReverseCodeDialog.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/DropReverseCommand.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/DropReverseCommand.java
index 9fdb9fb8505..9fdb9fb8505 100755
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/DropReverseCommand.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/DropReverseCommand.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/DropReverseStrategy.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/DropReverseStrategy.java
index a302a6d3418..a302a6d3418 100755
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/DropReverseStrategy.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/DropReverseStrategy.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/Messages.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/Messages.java
index 3253c5eb40a..3253c5eb40a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/Messages.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/Messages.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/messages.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/messages.properties
index 753937a59b2..753937a59b2 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/messages.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/dnd/messages.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/handlers/CreateAssociationFromPropertyHandler.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/handlers/CreateAssociationFromPropertyHandler.java
index 848f5ea6cbc..848f5ea6cbc 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/handlers/CreateAssociationFromPropertyHandler.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/handlers/CreateAssociationFromPropertyHandler.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/messages.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/messages.properties
index a754ab7df2a..a754ab7df2a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/messages.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/messages.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/.project
index 9f8df991a34..9f8df991a34 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/META-INF/MANIFEST.MF
index bb2e8d708bb..bb2e8d708bb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/META-INF/MANIFEST.MF
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/build.properties
index d012a1e3eec..d012a1e3eec 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/plugin.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/plugin.properties
index 4baa6d1eeda..4baa6d1eeda 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/plugin.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/plugin.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/pom.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/pom.xml
index 7c10666dbca..4ea411b632b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/pom.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.reverse</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParser.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParser.java
index 9eeb4b984c4..9eeb4b984c4 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParser.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParser.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParserConstants.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParserConstants.java
index c17a56d91e0..c17a56d91e0 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParserConstants.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParserConstants.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParserTokenManager.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParserTokenManager.java
index dad38f6ece0..dad38f6ece0 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParserTokenManager.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ASTParserTokenManager.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/JavaCharStream.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/JavaCharStream.java
index b094f6dbaf4..b094f6dbaf4 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/JavaCharStream.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/JavaCharStream.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/JavaParser.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/JavaParser.java
index 18f98ec9a1e..18f98ec9a1e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/JavaParser.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/JavaParser.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ParseException.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ParseException.java
index adbf212f98b..adbf212f98b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ParseException.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ParseException.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/Token.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/Token.java
index 9a885a1f69c..9a885a1f69c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/Token.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/Token.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/TokenMgrError.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/TokenMgrError.java
index 4f46a2efcad..4f46a2efcad 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/TokenMgrError.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/TokenMgrError.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/BlockComment.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/BlockComment.java
index ac8b4dd5310..ac8b4dd5310 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/BlockComment.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/BlockComment.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/Comment.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/Comment.java
index c01837cc87b..c01837cc87b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/Comment.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/Comment.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/CompilationUnit.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/CompilationUnit.java
index f2ab3a88f90..f2ab3a88f90 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/CompilationUnit.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/CompilationUnit.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/ImportDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/ImportDeclaration.java
index d4bf38a08cb..d4bf38a08cb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/ImportDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/ImportDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/LineComment.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/LineComment.java
index 83636a74d7e..83636a74d7e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/LineComment.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/LineComment.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/Node.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/Node.java
index 3d396b3777f..3d396b3777f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/Node.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/Node.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/PackageDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/PackageDeclaration.java
index cc910afe4f6..cc910afe4f6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/PackageDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/PackageDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/TypeParameter.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/TypeParameter.java
index 6d5006fb1b9..6d5006fb1b9 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/TypeParameter.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/TypeParameter.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/AnnotationDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/AnnotationDeclaration.java
index 07ad2b8a3c6..07ad2b8a3c6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/AnnotationDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/AnnotationDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/AnnotationMemberDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/AnnotationMemberDeclaration.java
index e453f0a3903..e453f0a3903 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/AnnotationMemberDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/AnnotationMemberDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/BodyDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/BodyDeclaration.java
index af540c292f2..af540c292f2 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/BodyDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/BodyDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ClassOrInterfaceDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ClassOrInterfaceDeclaration.java
index 473bb244159..473bb244159 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ClassOrInterfaceDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ClassOrInterfaceDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ConstructorDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ConstructorDeclaration.java
index 8af73d596f4..8af73d596f4 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ConstructorDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ConstructorDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EmptyMemberDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EmptyMemberDeclaration.java
index 79f1c7601d5..79f1c7601d5 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EmptyMemberDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EmptyMemberDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EmptyTypeDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EmptyTypeDeclaration.java
index 7090017fde2..7090017fde2 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EmptyTypeDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EmptyTypeDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EnumConstantDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EnumConstantDeclaration.java
index 814bd2e3ced..814bd2e3ced 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EnumConstantDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EnumConstantDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EnumDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EnumDeclaration.java
index b1185537641..b1185537641 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EnumDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/EnumDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/FieldDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/FieldDeclaration.java
index e868e7a7320..e868e7a7320 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/FieldDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/FieldDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/InitializerDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/InitializerDeclaration.java
index 0f3882b3845..0f3882b3845 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/InitializerDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/InitializerDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/JavadocComment.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/JavadocComment.java
index 5241b3cf22b..5241b3cf22b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/JavadocComment.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/JavadocComment.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/MethodDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/MethodDeclaration.java
index 1337198d173..1337198d173 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/MethodDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/MethodDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ModifierSet.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ModifierSet.java
index ad2dfaa7253..ad2dfaa7253 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ModifierSet.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/ModifierSet.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/Parameter.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/Parameter.java
index faa4c8fff26..faa4c8fff26 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/Parameter.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/Parameter.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/TypeDeclaration.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/TypeDeclaration.java
index 79107a962ed..79107a962ed 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/TypeDeclaration.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/TypeDeclaration.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/VariableDeclarator.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/VariableDeclarator.java
index d5ecc164f09..d5ecc164f09 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/VariableDeclarator.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/VariableDeclarator.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/VariableDeclaratorId.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/VariableDeclaratorId.java
index 98bdd8c040c..98bdd8c040c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/VariableDeclaratorId.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/body/VariableDeclaratorId.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/AnnotationExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/AnnotationExpr.java
index a0cb8e270bf..a0cb8e270bf 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/AnnotationExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/AnnotationExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayAccessExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayAccessExpr.java
index 2b3ceb92b03..2b3ceb92b03 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayAccessExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayAccessExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayCreationExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayCreationExpr.java
index 94e379150ae..94e379150ae 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayCreationExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayCreationExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayInitializerExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayInitializerExpr.java
index 9f38c589759..9f38c589759 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayInitializerExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ArrayInitializerExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/AssignExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/AssignExpr.java
index 6b9c715f212..6b9c715f212 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/AssignExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/AssignExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/BinaryExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/BinaryExpr.java
index 7742be65b5e..7742be65b5e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/BinaryExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/BinaryExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/BooleanLiteralExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/BooleanLiteralExpr.java
index 4f614b88bed..4f614b88bed 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/BooleanLiteralExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/BooleanLiteralExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/CastExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/CastExpr.java
index 85e4fbf8007..85e4fbf8007 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/CastExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/CastExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/CharLiteralExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/CharLiteralExpr.java
index 09c9372fd41..09c9372fd41 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/CharLiteralExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/CharLiteralExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ClassExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ClassExpr.java
index c3e59ee3755..c3e59ee3755 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ClassExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ClassExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ConditionalExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ConditionalExpr.java
index de616bbe851..de616bbe851 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ConditionalExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ConditionalExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/DoubleLiteralExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/DoubleLiteralExpr.java
index 02df5bbc474..02df5bbc474 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/DoubleLiteralExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/DoubleLiteralExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/EnclosedExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/EnclosedExpr.java
index 90a0f0882af..90a0f0882af 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/EnclosedExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/EnclosedExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/Expression.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/Expression.java
index f4813ee2ed2..f4813ee2ed2 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/Expression.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/Expression.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/FieldAccessExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/FieldAccessExpr.java
index 444956e1bdb..444956e1bdb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/FieldAccessExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/FieldAccessExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/InstanceOfExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/InstanceOfExpr.java
index cf2954c3a27..cf2954c3a27 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/InstanceOfExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/InstanceOfExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/IntegerLiteralExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/IntegerLiteralExpr.java
index ff362ace5f1..ff362ace5f1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/IntegerLiteralExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/IntegerLiteralExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/IntegerLiteralMinValueExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/IntegerLiteralMinValueExpr.java
index c4a14c6389d..c4a14c6389d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/IntegerLiteralMinValueExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/IntegerLiteralMinValueExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LiteralExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LiteralExpr.java
index e2fe637eb35..e2fe637eb35 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LiteralExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LiteralExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LongLiteralExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LongLiteralExpr.java
index f5009c15038..f5009c15038 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LongLiteralExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LongLiteralExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LongLiteralMinValueExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LongLiteralMinValueExpr.java
index fc26b305378..fc26b305378 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LongLiteralMinValueExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/LongLiteralMinValueExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MarkerAnnotationExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MarkerAnnotationExpr.java
index 36d76f9ff6d..36d76f9ff6d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MarkerAnnotationExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MarkerAnnotationExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MemberValuePair.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MemberValuePair.java
index c309831ee79..c309831ee79 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MemberValuePair.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MemberValuePair.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MethodCallExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MethodCallExpr.java
index 577833afb9a..577833afb9a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MethodCallExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/MethodCallExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NameExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NameExpr.java
index b265fc516ea..b265fc516ea 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NameExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NameExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NormalAnnotationExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NormalAnnotationExpr.java
index 3dd6642aace..3dd6642aace 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NormalAnnotationExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NormalAnnotationExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NullLiteralExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NullLiteralExpr.java
index 3b225fd94b4..3b225fd94b4 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NullLiteralExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/NullLiteralExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ObjectCreationExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ObjectCreationExpr.java
index 59c7ee4f3fa..59c7ee4f3fa 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ObjectCreationExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ObjectCreationExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/QualifiedNameExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/QualifiedNameExpr.java
index a265e6ffc2b..a265e6ffc2b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/QualifiedNameExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/QualifiedNameExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/SingleMemberAnnotationExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/SingleMemberAnnotationExpr.java
index 68a013d0691..68a013d0691 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/SingleMemberAnnotationExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/SingleMemberAnnotationExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/StringLiteralExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/StringLiteralExpr.java
index 2cf2e0f0608..2cf2e0f0608 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/StringLiteralExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/StringLiteralExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/SuperExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/SuperExpr.java
index 7c65800ccd3..7c65800ccd3 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/SuperExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/SuperExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ThisExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ThisExpr.java
index bff1d408766..bff1d408766 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ThisExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/ThisExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/UnaryExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/UnaryExpr.java
index d8607f05723..d8607f05723 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/UnaryExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/UnaryExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/VariableDeclarationExpr.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/VariableDeclarationExpr.java
index 32e0272a2b6..32e0272a2b6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/VariableDeclarationExpr.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/expr/VariableDeclarationExpr.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/AssertStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/AssertStmt.java
index 0f184cd1e59..0f184cd1e59 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/AssertStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/AssertStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/BlockStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/BlockStmt.java
index 1ac9d534ca1..1ac9d534ca1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/BlockStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/BlockStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/BreakStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/BreakStmt.java
index 2388f620786..2388f620786 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/BreakStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/BreakStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/CatchClause.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/CatchClause.java
index 8ccbc320e72..8ccbc320e72 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/CatchClause.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/CatchClause.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ContinueStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ContinueStmt.java
index de6a07d2b35..de6a07d2b35 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ContinueStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ContinueStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/DoStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/DoStmt.java
index 2660f385c46..2660f385c46 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/DoStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/DoStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/EmptyStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/EmptyStmt.java
index 121bfa34e78..121bfa34e78 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/EmptyStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/EmptyStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ExplicitConstructorInvocationStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ExplicitConstructorInvocationStmt.java
index b0176fafe72..b0176fafe72 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ExplicitConstructorInvocationStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ExplicitConstructorInvocationStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ExpressionStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ExpressionStmt.java
index 3413a2199f1..3413a2199f1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ExpressionStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ExpressionStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ForStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ForStmt.java
index a3f465a6b14..a3f465a6b14 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ForStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ForStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ForeachStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ForeachStmt.java
index 8d3f6a156a1..8d3f6a156a1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ForeachStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ForeachStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/IfStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/IfStmt.java
index 1a8d237efd8..1a8d237efd8 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/IfStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/IfStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/LabeledStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/LabeledStmt.java
index 737f1626b52..737f1626b52 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/LabeledStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/LabeledStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ReturnStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ReturnStmt.java
index 598f73a24d1..598f73a24d1 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ReturnStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ReturnStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/Statement.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/Statement.java
index 386746d8629..386746d8629 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/Statement.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/Statement.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SwitchEntryStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SwitchEntryStmt.java
index 8ff7e3f25a6..8ff7e3f25a6 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SwitchEntryStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SwitchEntryStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SwitchStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SwitchStmt.java
index d18eaa975a3..d18eaa975a3 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SwitchStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SwitchStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SynchronizedStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SynchronizedStmt.java
index 25de6c6a157..25de6c6a157 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SynchronizedStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/SynchronizedStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ThrowStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ThrowStmt.java
index d329cb078e7..d329cb078e7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ThrowStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/ThrowStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/TryStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/TryStmt.java
index 7ec39e6bad3..7ec39e6bad3 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/TryStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/TryStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/TypeDeclarationStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/TypeDeclarationStmt.java
index a578dd811ee..a578dd811ee 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/TypeDeclarationStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/TypeDeclarationStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/WhileStmt.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/WhileStmt.java
index 0a2c96efd3a..0a2c96efd3a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/WhileStmt.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/stmt/WhileStmt.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/ClassOrInterfaceType.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/ClassOrInterfaceType.java
index a233bc1fa93..a233bc1fa93 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/ClassOrInterfaceType.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/ClassOrInterfaceType.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/PrimitiveType.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/PrimitiveType.java
index 06b5dcf1601..06b5dcf1601 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/PrimitiveType.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/PrimitiveType.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/ReferenceType.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/ReferenceType.java
index f19afbb0c4c..f19afbb0c4c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/ReferenceType.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/ReferenceType.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/Type.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/Type.java
index ad0afadff96..ad0afadff96 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/Type.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/Type.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/VoidType.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/VoidType.java
index 1502105620f..1502105620f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/VoidType.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/VoidType.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/WildcardType.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/WildcardType.java
index e1af38fbf7b..e1af38fbf7b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/WildcardType.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/type/WildcardType.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/DumpVisitor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/DumpVisitor.java
index 8b10b6c85f9..8b10b6c85f9 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/DumpVisitor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/DumpVisitor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/GenericVisitor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/GenericVisitor.java
index 8041649a27f..8041649a27f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/GenericVisitor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/GenericVisitor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/GenericVisitorAdapter.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/GenericVisitorAdapter.java
index 5140baac26e..5140baac26e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/GenericVisitorAdapter.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/GenericVisitorAdapter.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/VoidVisitor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/VoidVisitor.java
index 4996631b4be..4996631b4be 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/VoidVisitor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/VoidVisitor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/VoidVisitorAdapter.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/VoidVisitorAdapter.java
index ed7af7e364a..ed7af7e364a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/VoidVisitorAdapter.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/ast/visitor/VoidVisitorAdapter.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/java_1_5.jj b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/java_1_5.jj
index f35074082d9..f35074082d9 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/japa/parser/java_1_5.jj
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/japa/parser/java_1_5.jj
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ClassifierCatalog.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ClassifierCatalog.java
index f7777787f1e..f7777787f1e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ClassifierCatalog.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ClassifierCatalog.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CompilationUnitAnalyser.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CompilationUnitAnalyser.java
index 78a09f7764e..78a09f7764e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CompilationUnitAnalyser.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CompilationUnitAnalyser.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CreationPackageCatalog.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CreationPackageCatalog.java
index 5266bb2df21..5266bb2df21 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CreationPackageCatalog.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CreationPackageCatalog.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CuPrinter.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CuPrinter.java
index a0a4271eeac..a0a4271eeac 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CuPrinter.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/CuPrinter.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/GenericSwitchVisitor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/GenericSwitchVisitor.java
index 96fc7f91e97..96fc7f91e97 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/GenericSwitchVisitor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/GenericSwitchVisitor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/GenericTransformer.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/GenericTransformer.java
index 49ac5b4e7ca..49ac5b4e7ca 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/GenericTransformer.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/GenericTransformer.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ImportedTypeCatalog.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ImportedTypeCatalog.java
index de8ededd8e5..de8ededd8e5 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ImportedTypeCatalog.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ImportedTypeCatalog.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ModelManager.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ModelManager.java
index 56cae4aa276..56cae4aa276 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ModelManager.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/ModelManager.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/QualifiedName.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/QualifiedName.java
index 7b549cc8868..7b549cc8868 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/QualifiedName.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/QualifiedName.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/SwitchVisitor.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/SwitchVisitor.java
index 5c06cc5c95a..5c06cc5c95a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/SwitchVisitor.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/SwitchVisitor.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/TypeAnalyser.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/TypeAnalyser.java
index c49c9828c10..c49c9828c10 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/TypeAnalyser.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/TypeAnalyser.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/TypeAnalyserAndTranslator.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/TypeAnalyserAndTranslator.java
index d551fde8532..d551fde8532 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/TypeAnalyserAndTranslator.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/TypeAnalyserAndTranslator.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/UmlParser.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/UmlParser.java
index 51bf3d209a5..51bf3d209a5 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/UmlParser.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/UmlParser.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/UmlUtils.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/UmlUtils.java
index 327cbb3c828..327cbb3c828 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/UmlUtils.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/javagen/umlparser/UmlUtils.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/org/eclipse/papyrus/java/reverse/Activator.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/org/eclipse/papyrus/java/reverse/Activator.java
index eea09e53942..eea09e53942 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/org/eclipse/papyrus/java/reverse/Activator.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/org/eclipse/papyrus/java/reverse/Activator.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/org/eclipse/papyrus/java/reverse/utils/TypeOperationsEnhanced.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/org/eclipse/papyrus/java/reverse/utils/TypeOperationsEnhanced.java
index 55a0f3132b3..55a0f3132b3 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/src/org/eclipse/papyrus/java/reverse/utils/TypeOperationsEnhanced.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse/src/org/eclipse/papyrus/java/reverse/utils/TypeOperationsEnhanced.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/.classpath b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/.classpath
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/.classpath
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/.project b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/.project
index 4bfadfe48b4..4bfadfe48b4 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/.project
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/.project
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..4759947300a 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/META-INF/MANIFEST.MF
index 9c471179c14..9c471179c14 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/META-INF/MANIFEST.MF
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/about.html b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/about.html
index a80e9697355..a80e9697355 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/about.html
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/about.html
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/build.properties b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/build.properties
index 534691f258d..534691f258d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/build.properties
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/build.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/plugin.xml b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/plugin.xml
index f34d144cb6e..f34d144cb6e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/plugin.xml
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/plugin.xml
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/Activator.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/Activator.java
index dc84187efd2..dc84187efd2 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/Activator.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/Activator.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/resolvers/BundleActivatorResolver.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/resolvers/BundleActivatorResolver.java
index fddd864d9eb..fddd864d9eb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/resolvers/BundleActivatorResolver.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/resolvers/BundleActivatorResolver.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/resolvers/RegisterResolver.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/resolvers/RegisterResolver.java
index 95c0461ac39..95c0461ac39 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/resolvers/RegisterResolver.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.template/src/org/eclipse/papyrus/java/template/resolvers/RegisterResolver.java
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/.classpath b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/.classpath
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/.project b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.project
index f710852782a..f710852782a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/.project
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.project
diff --git a/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..94d61f00da6
--- /dev/null
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/META-INF/MANIFEST.MF
index ea1f0a8a41f..a09b81b1fc6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.codegen.base.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.codegen.base;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/about.html b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/about.html
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/build.properties b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/build.properties
index feffce05748..db71331cf59 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/build.properties
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               icons/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties,\
+               icons/
+src.includes = about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/icons/codegen-16x16.gif b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/icons/codegen-16x16.gif
index d7c1a7365f5..d7c1a7365f5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/icons/codegen-16x16.gif
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/icons/codegen-16x16.gif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/plugin.properties b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/plugin.properties
index 1e85d2491da..1e85d2491da 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/plugin.properties
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/plugin.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/pom.xml b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/pom.xml
index 72a38ed6f97..956ac30859b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/pom.xml
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/pom.xml
@@ -5,7 +5,7 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.codegen.base</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/Activator.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/Activator.java
index b4c1e58de7f..b4c1e58de7f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/Activator.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/Activator.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java
index bf1304e37cb..bf1304e37cb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/HierarchyLocationStrategy.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/HierarchyLocationStrategy.java
index fdb90709689..fdb90709689 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/HierarchyLocationStrategy.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/HierarchyLocationStrategy.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ILocationStrategy.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ILocationStrategy.java
index 7820bdece18..7820bdece18 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ILocationStrategy.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ILocationStrategy.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/IPFileSystemAccess.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/IPFileSystemAccess.java
index e72057135b4..e72057135b4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/IPFileSystemAccess.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/IPFileSystemAccess.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/JavaIoFileSystemAccess.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/JavaIoFileSystemAccess.java
index e10e9ad2566..e10e9ad2566 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/JavaIoFileSystemAccess.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/JavaIoFileSystemAccess.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/Messages.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/Messages.java
index 3d66d4250c7..3d66d4250c7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/Messages.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/Messages.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ModelElementsCreator.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ModelElementsCreator.java
index ed1acce196a..ed1acce196a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ModelElementsCreator.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ModelElementsCreator.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ProjectBasedFileAccess.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ProjectBasedFileAccess.java
index 17b6e97948c..17b6e97948c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ProjectBasedFileAccess.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/ProjectBasedFileAccess.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ChangeObject.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ChangeObject.java
index e380ed65c45..e380ed65c45 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ChangeObject.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ChangeObject.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ManageChangeEvents.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ManageChangeEvents.java
index fdac34742d7..fdac34742d7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ManageChangeEvents.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ManageChangeEvents.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/RecordEventsListener.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/RecordEventsListener.java
index 8ae6ee95b1d..8ae6ee95b1d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/RecordEventsListener.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/RecordEventsListener.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/messages.properties b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/messages.properties
index ad6e5a9fa79..ad6e5a9fa79 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/messages.properties
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/messages.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/.classpath b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/.classpath
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/.project b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/.project
index 24d01935406..24d01935406 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/.project
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/.project
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/.settings/org.eclipse.jdt.core.prefs
index c537b63063c..c537b63063c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/META-INF/MANIFEST.MF
index ac580de577f..ac580de577f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/META-INF/MANIFEST.MF
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/about.html b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/about.html
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/build.properties b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/build.properties
index 7e6b2a43702..7e6b2a43702 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/build.properties
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/build.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/plugin.properties b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/plugin.properties
index d7801588e2c..d7801588e2c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/plugin.properties
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/plugin.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/plugin.xml b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/plugin.xml
index 95044cba2e2..95044cba2e2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/plugin.xml
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/plugin.xml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/pom.xml b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/pom.xml
index b01a3b6046a..d5ec9f7c45a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/pom.xml
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.codegen.extensionpoints</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/schema/languageCodegen.exsd b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/schema/languageCodegen.exsd
index 7b60f913ef4..7b60f913ef4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/schema/languageCodegen.exsd
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/schema/languageCodegen.exsd
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/schema/languageProject.exsd b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/schema/languageProject.exsd
index c631741cac1..c631741cac1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/schema/languageProject.exsd
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/schema/languageProject.exsd
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/AbstractSettings.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/AbstractSettings.java
index 75d82ca546b..75d82ca546b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/AbstractSettings.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/AbstractSettings.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/Activator.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/Activator.java
index c8bcb71a91f..c8bcb71a91f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/Activator.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/Activator.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/GenerationConstants.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/GenerationConstants.java
index 45d46b12c70..45d46b12c70 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/GenerationConstants.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/GenerationConstants.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/GeneratorSelectionDialog.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/GeneratorSelectionDialog.java
index fd3066b0ddf..fd3066b0ddf 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/GeneratorSelectionDialog.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/GeneratorSelectionDialog.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangCodegen.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangCodegen.java
index 9c1c5fa8371..9c1c5fa8371 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangCodegen.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangCodegen.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangCodegen2.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangCodegen2.java
index 1cf48b4455a..1cf48b4455a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangCodegen2.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangCodegen2.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangProjectSupport.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangProjectSupport.java
index 883ba90b22a..883ba90b22a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangProjectSupport.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/ILangProjectSupport.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/LanguageCodegen.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/LanguageCodegen.java
index 2bb0796017c..2bb0796017c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/LanguageCodegen.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/LanguageCodegen.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/LanguageProjectSupport.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/LanguageProjectSupport.java
index 031993d2adb..031993d2adb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/LanguageProjectSupport.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/LanguageProjectSupport.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/Messages.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/Messages.java
index 7ef890e1a85..7ef890e1a85 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/Messages.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/Messages.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/MethodInfo.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/MethodInfo.java
index 3886c365d17..3886c365d17 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/MethodInfo.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/MethodInfo.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/SyncInformation.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/SyncInformation.java
index 82f5d4e4af9..82f5d4e4af9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/SyncInformation.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/SyncInformation.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/messages.properties b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/messages.properties
index 72942846feb..72942846feb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/messages.properties
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints/src/org/eclipse/papyrus/codegen/extensionpoints/messages.properties
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/.classpath b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/.classpath
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/.project b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/.project
index 166c5980713..166c5980713 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/.project
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/.project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
index 4b8a8b4deec..4b8a8b4deec 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/about.html b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/about.html
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/build.properties b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/build.properties
index 83183307edb..83183307edb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/build.properties
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/build.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/model/texteditormodel.ecore b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/model/texteditormodel.ecore
index 9a9647a4907..9a9647a4907 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/model/texteditormodel.ecore
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/model/texteditormodel.ecore
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/model/texteditormodel.genmodel b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/model/texteditormodel.genmodel
index 37ae28a3a40..37ae28a3a40 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/model/texteditormodel.genmodel
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/model/texteditormodel.genmodel
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/plugin.properties b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/plugin.properties
index 8f2b155a923..8f2b155a923 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/plugin.properties
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/plugin.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/plugin.xml b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/plugin.xml
index 444ce844d4c..444ce844d4c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/plugin.xml
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/plugin.xml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/pom.xml b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/pom.xml
index eebe33e351b..44e5f92bb71 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/pom.xml
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.texteditor.model</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModel.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModel.java
index bc2a6b449b1..bc2a6b449b1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModel.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModel.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModelFactory.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModelFactory.java
index 705f79b8b40..705f79b8b40 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModelFactory.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModelFactory.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModelPackage.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModelPackage.java
index 25da2ea1bf8..25da2ea1bf8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModelPackage.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/TextEditorModelPackage.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelFactoryImpl.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelFactoryImpl.java
index 997f6ff4c0b..997f6ff4c0b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelFactoryImpl.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelFactoryImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelImpl.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelImpl.java
index c11dafff246..c11dafff246 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelImpl.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelPackageImpl.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelPackageImpl.java
index 8e10c9e3320..8e10c9e3320 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelPackageImpl.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/impl/TextEditorModelPackageImpl.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/util/TextEditorModelAdapterFactory.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/util/TextEditorModelAdapterFactory.java
index 073c23deb57..073c23deb57 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/util/TextEditorModelAdapterFactory.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/util/TextEditorModelAdapterFactory.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/util/TextEditorModelSwitch.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/util/TextEditorModelSwitch.java
index 2e8d35c8cea..2e8d35c8cea 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/util/TextEditorModelSwitch.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model/src/org/eclipse/papyrus/texteditor/model/texteditormodel/util/TextEditorModelSwitch.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.classpath b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.classpath
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.classpath
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.project b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.project
index 81eff2e0ed5..81eff2e0ed5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.project
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
index f3e062e8080..f3e062e8080 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/about.html b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/about.html
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/build.properties b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/build.properties
index a42c291785a..a42c291785a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/build.properties
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/build.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/plugin.properties b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/plugin.properties
index e3cf0949e64..e3cf0949e64 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/plugin.properties
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/plugin.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/plugin.xml b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/plugin.xml
index d9537fda209..d9537fda209 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/plugin.xml
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/plugin.xml
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/pom.xml b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/pom.xml
index 6d97872ed73..e5345634035 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/pom.xml
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.texteditor.modelexplorer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/resources/TextEditorFacet.custom b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/resources/TextEditorFacet.custom
index 8566b496c67..8566b496c67 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/resources/TextEditorFacet.custom
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/resources/TextEditorFacet.custom
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/Activator.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/Activator.java
index d37acadb2ff..d37acadb2ff 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/Activator.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/Activator.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/adapters/TextEditorAdapterFactory.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/adapters/TextEditorAdapterFactory.java
index b3b416be9c9..b3b416be9c9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/adapters/TextEditorAdapterFactory.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/adapters/TextEditorAdapterFactory.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetContainedTextEditors.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetContainedTextEditors.java
index eae3a2f2554..eae3a2f2554 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetContainedTextEditors.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetContainedTextEditors.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetTextEditorIcon.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetTextEditorIcon.java
index 7fb77ffdcbd..7fb77ffdcbd 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetTextEditorIcon.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetTextEditorIcon.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetTextEditorName.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetTextEditorName.java
index d7d4e826ef6..d7d4e826ef6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetTextEditorName.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetTextEditorName.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java
index f6d3c9d35f4..f6d3c9d35f4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/NotVisibleStructuralFeatureQuery.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/NotVisibleStructuralFeatureQuery.java
index 609afc7abd2..609afc7abd2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/NotVisibleStructuralFeatureQuery.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/NotVisibleStructuralFeatureQuery.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/.classpath b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/.classpath
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/.classpath
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/.project b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/.project
index 856e4c4cd85..856e4c4cd85 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/.project
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/.project
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/.settings/org.eclipse.jdt.core.prefs
index f42de363afa..f42de363afa 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF
index fd139e5c660..fd139e5c660 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/about.html b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/about.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/about.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/build.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/build.properties
index cb863c1cf51..cb863c1cf51 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/build.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/build.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/connector.png b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/connector.png
index 975629baeaa..975629baeaa 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/connector.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/connector.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/connector.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/connector.svg
index c56fadbf37d..c56fadbf37d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/connector.svg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/connector.svg
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/icons/deploy.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/deploy.gif
index 7a7ced35f3d..7a7ced35f3d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/icons/deploy.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/deploy.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/fcm.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/fcm.gif
index ec21c358e2f..ec21c358e2f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/fcm.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/fcm.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/hires/connector.png b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/hires/connector.png
index e2be455d487..e2be455d487 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/hires/connector.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/hires/connector.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/port.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/port.gif
index 4aea611efe7..4aea611efe7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/port.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/port.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/target.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/target.gif
index 92b10039973..92b10039973 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/target.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/icons/target.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore
index dda5a4bf17e..dda5a4bf17e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel
index d14164bedca..d14164bedca 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.di b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.di
index 375842f73a9..375842f73a9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation
index 273d8fcf69a..273d8fcf69a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml
index 1e2517210f2..1e2517210f2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/palettes/palette-classdep.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/palettes/palette-classdep.xml
index 2352951986c..2352951986c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/palettes/palette-classdep.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/palettes/palette-classdep.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/palettes/palette-composite.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/palettes/palette-composite.xml
index d5afbd294a9..d5afbd294a9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/palettes/palette-composite.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/palettes/palette-composite.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/plugin.properties
index f15495b325f..f15495b325f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/plugin.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/plugin.xml
index fd9d5ec828a..fd9d5ec828a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/plugin.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/pom.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/pom.xml
index 30de6eb7866..ae9c10ff8a4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/pom.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.fcm.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmBindingHelper.exsd b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/schema/fcmBindingHelper.exsd
index e51291f98af..e51291f98af 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmBindingHelper.exsd
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/schema/fcmBindingHelper.exsd
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmEmbeddingRule.exsd b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/schema/fcmEmbeddingRule.exsd
index 82aa794425b..82aa794425b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmEmbeddingRule.exsd
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/schema/fcmEmbeddingRule.exsd
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmPortMappingRule.exsd b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/schema/fcmPortMappingRule.exsd
index 77f6e9cb5e4..77f6e9cb5e4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmPortMappingRule.exsd
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/schema/fcmPortMappingRule.exsd
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Activator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Activator.java
index 2d60ac344ee..2d60ac344ee 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Activator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Activator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Assembly.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Assembly.java
index 1d4189e3920..1d4189e3920 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Assembly.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Assembly.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/AutoIndex.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/AutoIndex.java
index 40a23903437..40a23903437 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/AutoIndex.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/AutoIndex.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/AutoIndexPerNode.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/AutoIndexPerNode.java
index d986de382f4..d986de382f4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/AutoIndexPerNode.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/AutoIndexPerNode.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindTemplate.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindTemplate.java
index 94380f0d970..94380f0d970 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindTemplate.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindTemplate.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindingHelper.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindingHelper.java
index 901e429efb1..901e429efb1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindingHelper.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindingHelper.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CodeGenOptions.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CodeGenOptions.java
index a0554816e52..a0554816e52 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CodeGenOptions.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CodeGenOptions.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompImplTemplate.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompImplTemplate.java
index 25ff298bda8..25ff298bda8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompImplTemplate.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompImplTemplate.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompToOOmapping.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompToOOmapping.java
index 45a6ac2a439..45a6ac2a439 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompToOOmapping.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompToOOmapping.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompilerChain.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompilerChain.java
index c788bf107d5..c788bf107d5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompilerChain.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CompilerChain.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigOption.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigOption.java
index 18537c5d33b..18537c5d33b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigOption.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigOption.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigurableElementInstance.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigurableElementInstance.java
index 480e38b98fb..480e38b98fb 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigurableElementInstance.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigurableElementInstance.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Configuration.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Configuration.java
index af652b2f3de..af652b2f3de 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Configuration.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Configuration.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigurationProperty.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigurationProperty.java
index 505e9ad4b84..505e9ad4b84 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigurationProperty.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConfigurationProperty.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Connector.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Connector.java
index e8ad70be248..e8ad70be248 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Connector.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Connector.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConnectorConfiguration.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConnectorConfiguration.java
index cd7bb6bcd19..cd7bb6bcd19 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConnectorConfiguration.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ConnectorConfiguration.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ContainerRule.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ContainerRule.java
index 4b4ad0161f8..4b4ad0161f8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ContainerRule.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ContainerRule.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ContainerRuleKind.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ContainerRuleKind.java
index 6366f1cc62a..6366f1cc62a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ContainerRuleKind.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ContainerRuleKind.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CopyAttributeValue.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CopyAttributeValue.java
index 414ccb88e3d..414ccb88e3d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CopyAttributeValue.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/CopyAttributeValue.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/DeploymentPlan.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/DeploymentPlan.java
index 7a0d9dc3d44..7a0d9dc3d44 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/DeploymentPlan.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/DeploymentPlan.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/DerivedElement.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/DerivedElement.java
index 58ff9aee3ba..58ff9aee3ba 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/DerivedElement.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/DerivedElement.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMFactory.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMFactory.java
index 907c2d5b4e3..907c2d5b4e3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMFactory.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMFactory.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java
index 1dc5cea5fed..1dc5cea5fed 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Flatten.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Flatten.java
index 9a89c91f924..9a89c91f924 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Flatten.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Flatten.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Fragment.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Fragment.java
index 53f4baac33e..53f4baac33e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Fragment.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Fragment.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ImplementationGroup.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ImplementationGroup.java
index fc79e9d0ea6..fc79e9d0ea6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ImplementationGroup.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ImplementationGroup.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ImplementationProperties.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ImplementationProperties.java
index 8a3bd56e5bc..8a3bd56e5bc 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ImplementationProperties.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ImplementationProperties.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InitPrecedence.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InitPrecedence.java
index 8c6af695105..8c6af695105 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InitPrecedence.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InitPrecedence.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InstanceConfigurator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InstanceConfigurator.java
index bb463ad5340..bb463ad5340 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InstanceConfigurator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InstanceConfigurator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InteractionComponent.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InteractionComponent.java
index cbef19b172b..cbef19b172b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InteractionComponent.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InteractionComponent.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InterceptionKind.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InterceptionKind.java
index 24de3ce829e..24de3ce829e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InterceptionKind.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InterceptionKind.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InterceptionRule.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InterceptionRule.java
index 44adb8c7700..44adb8c7700 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InterceptionRule.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InterceptionRule.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/OperatingSystem.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/OperatingSystem.java
index e9dc05079f7..e9dc05079f7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/OperatingSystem.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/OperatingSystem.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Port.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Port.java
index 0f1da61cd0c..0f1da61cd0c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Port.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Port.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/PortKind.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/PortKind.java
index 82ad56f8cf7..82ad56f8cf7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/PortKind.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/PortKind.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ProgLanguage.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ProgLanguage.java
index 8458d640c94..8458d640c94 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ProgLanguage.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ProgLanguage.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/RuleApplication.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/RuleApplication.java
index 5fedd0d9a3a..5fedd0d9a3a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/RuleApplication.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/RuleApplication.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Singleton.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Singleton.java
index 097280acf11..097280acf11 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Singleton.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Singleton.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Target.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Target.java
index 41bf2accb32..41bf2accb32 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Target.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Target.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TargetArchitecture.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TargetArchitecture.java
index 9d5c63c871a..9d5c63c871a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TargetArchitecture.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TargetArchitecture.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Template.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Template.java
index bf444e4e4b9..bf444e4e4b9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Template.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Template.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TemplatePort.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TemplatePort.java
index 77f0d02222f..77f0d02222f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TemplatePort.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TemplatePort.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/UseInstanceConfigurator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/UseInstanceConfigurator.java
index f0232d7637f..f0232d7637f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/UseInstanceConfigurator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/UseInstanceConfigurator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AssemblyImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AssemblyImpl.java
index 8d53df41fe1..8d53df41fe1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AssemblyImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AssemblyImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AutoIndexImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AutoIndexImpl.java
index 9379bae368d..9379bae368d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AutoIndexImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AutoIndexImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AutoIndexPerNodeImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AutoIndexPerNodeImpl.java
index ca4713734be..ca4713734be 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AutoIndexPerNodeImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/AutoIndexPerNodeImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindTemplateImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindTemplateImpl.java
index 84097ab7ee5..84097ab7ee5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindTemplateImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindTemplateImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindingHelperImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindingHelperImpl.java
index cca6f30bf16..cca6f30bf16 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindingHelperImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindingHelperImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CodeGenOptionsImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CodeGenOptionsImpl.java
index 87c4df5de26..87c4df5de26 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CodeGenOptionsImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CodeGenOptionsImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompImplTemplateImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompImplTemplateImpl.java
index ef442c13a78..ef442c13a78 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompImplTemplateImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompImplTemplateImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompToOOmappingImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompToOOmappingImpl.java
index c8337d11912..c8337d11912 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompToOOmappingImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompToOOmappingImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompilerChainImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompilerChainImpl.java
index 9f1edb84aa1..9f1edb84aa1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompilerChainImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CompilerChainImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigOptionImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigOptionImpl.java
index ddf33cb0dbc..ddf33cb0dbc 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigOptionImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigOptionImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurableElementInstanceImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurableElementInstanceImpl.java
index fb9e509e607..fb9e509e607 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurableElementInstanceImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurableElementInstanceImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurationImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurationImpl.java
index b4910abb934..b4910abb934 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurationImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurationImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurationPropertyImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurationPropertyImpl.java
index 38eab69aac7..38eab69aac7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurationPropertyImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConfigurationPropertyImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConnectorConfigurationImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConnectorConfigurationImpl.java
index 21bc4a77305..21bc4a77305 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConnectorConfigurationImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConnectorConfigurationImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConnectorImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConnectorImpl.java
index fc4c4381033..fc4c4381033 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConnectorImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ConnectorImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ContainerRuleImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ContainerRuleImpl.java
index 8b705f5b4fb..8b705f5b4fb 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ContainerRuleImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ContainerRuleImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CopyAttributeValueImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CopyAttributeValueImpl.java
index bc73efb61af..bc73efb61af 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CopyAttributeValueImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/CopyAttributeValueImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/DeploymentPlanImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/DeploymentPlanImpl.java
index eeec84970e5..eeec84970e5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/DeploymentPlanImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/DeploymentPlanImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/DerivedElementImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/DerivedElementImpl.java
index 3217b6ff94e..3217b6ff94e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/DerivedElementImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/DerivedElementImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMFactoryImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMFactoryImpl.java
index 9cd6ea0b76d..9cd6ea0b76d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMFactoryImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMFactoryImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java
index c59952dab6e..c59952dab6e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FlattenImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FlattenImpl.java
index df03b58b1df..df03b58b1df 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FlattenImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FlattenImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FragmentImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FragmentImpl.java
index 3b0f821b496..3b0f821b496 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FragmentImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FragmentImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ImplementationGroupImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ImplementationGroupImpl.java
index 42d65ff5e31..42d65ff5e31 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ImplementationGroupImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ImplementationGroupImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ImplementationPropertiesImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ImplementationPropertiesImpl.java
index 7f86201abbf..7f86201abbf 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ImplementationPropertiesImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ImplementationPropertiesImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InitPrecedenceImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InitPrecedenceImpl.java
index f3912aed57b..f3912aed57b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InitPrecedenceImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InitPrecedenceImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InstanceConfiguratorImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InstanceConfiguratorImpl.java
index 98c39d1bb77..98c39d1bb77 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InstanceConfiguratorImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InstanceConfiguratorImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InteractionComponentImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InteractionComponentImpl.java
index eda594ff7b3..eda594ff7b3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InteractionComponentImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InteractionComponentImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InterceptionRuleImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InterceptionRuleImpl.java
index 5c061d96327..5c061d96327 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InterceptionRuleImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InterceptionRuleImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/OperatingSystemImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/OperatingSystemImpl.java
index f102dd9fd32..f102dd9fd32 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/OperatingSystemImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/OperatingSystemImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortImpl.java
index 474cdf56684..474cdf56684 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortKindImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortKindImpl.java
index eb480f3a3fc..eb480f3a3fc 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortKindImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortKindImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ProgLanguageImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ProgLanguageImpl.java
index 367900b37a8..367900b37a8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ProgLanguageImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ProgLanguageImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/RuleApplicationImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/RuleApplicationImpl.java
index 8e9183bee71..8e9183bee71 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/RuleApplicationImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/RuleApplicationImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/SingletonImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/SingletonImpl.java
index 80a515a8d12..80a515a8d12 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/SingletonImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/SingletonImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TargetArchitectureImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TargetArchitectureImpl.java
index 5af10b34478..5af10b34478 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TargetArchitectureImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TargetArchitectureImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TargetImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TargetImpl.java
index 512c44b434d..512c44b434d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TargetImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TargetImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplateImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplateImpl.java
index 9bae3f5d98c..9bae3f5d98c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplateImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplateImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplatePortImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplatePortImpl.java
index 60fcc261168..60fcc261168 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplatePortImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplatePortImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/UseInstanceConfiguratorImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/UseInstanceConfiguratorImpl.java
index 21b2bcece52..21b2bcece52 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/UseInstanceConfiguratorImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/UseInstanceConfiguratorImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ConnectorTypeUtil.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ConnectorTypeUtil.java
index 919a7fcbff1..919a7fcbff1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ConnectorTypeUtil.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ConnectorTypeUtil.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMAdapterFactory.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMAdapterFactory.java
index ae3a258af53..ae3a258af53 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMAdapterFactory.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMAdapterFactory.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMResourceFactoryImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMResourceFactoryImpl.java
index 5a422f9f93f..5a422f9f93f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMResourceFactoryImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMResourceFactoryImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMResourceImpl.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMResourceImpl.java
index 44226971798..44226971798 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMResourceImpl.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMResourceImpl.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMSwitch.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMSwitch.java
index 8850265f42a..8850265f42a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMSwitch.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMSwitch.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMUtil.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMUtil.java
index 70d93d48d1b..70d93d48d1b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMUtil.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMUtil.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMXMLProcessor.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMXMLProcessor.java
index c529e27f558..c529e27f558 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMXMLProcessor.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMXMLProcessor.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IBindingHelper.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IBindingHelper.java
index b512b1e5b11..b512b1e5b11 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IBindingHelper.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IBindingHelper.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IEmbeddingRule.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IEmbeddingRule.java
index 8489c5377cc..8489c5377cc 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IEmbeddingRule.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IEmbeddingRule.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IMappingRule.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IMappingRule.java
index f5b37646df5..f5b37646df5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IMappingRule.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IMappingRule.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ITemplateMappingRule.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ITemplateMappingRule.java
index 2b9ef6487db..2b9ef6487db 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ITemplateMappingRule.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ITemplateMappingRule.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java
index c6e4699fb8e..c6e4699fb8e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/.classpath b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/.classpath
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/.classpath
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.project b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/.project
index 65c53f6af96..65c53f6af96 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.project
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/.project
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/.settings/org.eclipse.jdt.core.prefs
index f42de363afa..f42de363afa 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF
index 9228e09c908..9228e09c908 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/about.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/about.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/about.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/about.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/about.properties
index c06246d0761..c06246d0761 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/about.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/about.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
index f1dfcddd5ce..f1dfcddd5ce 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/build.properties
index 064ad77eb48..064ad77eb48 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/build.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/plugin.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/plugin.properties
index 25c07e8c396..25c07e8c396 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/plugin.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/plugin.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/plugin.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/plugin.xml
index 48a64c5147e..48a64c5147e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/plugin.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/plugin.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/pom.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/pom.xml
index 9d3891de40d..b567a2458a0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/pom.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/schema/externalGenerator.exsd b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/schema/externalGenerator.exsd
index f91f9c1ce35..f91f9c1ce35 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/schema/externalGenerator.exsd
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/schema/externalGenerator.exsd
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/schema/instanceConfig.exsd b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/schema/instanceConfig.exsd
index 9ebd4f01529..9ebd4f01529 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/schema/instanceConfig.exsd
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/schema/instanceConfig.exsd
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/schema/language.exsd b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/schema/language.exsd
index 9e7e950f59b..9e7e950f59b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/schema/language.exsd
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/schema/language.exsd
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/schema/ooTransformation.exsd b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/schema/ooTransformation.exsd
index ade738bcc04..ade738bcc04 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/schema/ooTransformation.exsd
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/schema/ooTransformation.exsd
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/schema/xtendGenerator.exsd b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/schema/xtendGenerator.exsd
index 33e2446c5f2..33e2446c5f2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/schema/xtendGenerator.exsd
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/schema/xtendGenerator.exsd
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Activator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Activator.java
index faee3a17083..faee3a17083 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Activator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Activator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CORBAtypeNames.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CORBAtypeNames.java
index 641fb676985..641fb676985 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CORBAtypeNames.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CORBAtypeNames.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CommandSupport.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CommandSupport.java
index 1ec058df103..1ec058df103 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CommandSupport.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CommandSupport.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConfigUtils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConfigUtils.java
index ccd34b07609..ccd34b07609 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConfigUtils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConfigUtils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java
index 517d8822117..517d8822117 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Description.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Description.java
index 58868c69112..58868c69112 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Description.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Description.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ElementFilter.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ElementFilter.java
index 297433c35a6..297433c35a6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ElementFilter.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ElementFilter.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/EnumService.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/EnumService.java
index 0062ec0809f..0062ec0809f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/EnumService.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/EnumService.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Log.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Log.java
index 27777c02ea8..27777c02ea8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Log.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Log.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java
index 645e06be789..645e06be789 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java
index 2971bbff614..2971bbff614 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/OperationUtils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/OperationUtils.java
index cdd17f48716..cdd17f48716 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/OperationUtils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/OperationUtils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortInfo.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortInfo.java
index ad70a8b6ce0..ad70a8b6ce0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortInfo.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortInfo.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java
index 9c60af571ef..9c60af571ef 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ProjectManagement.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ProjectManagement.java
index 3f66f3752a2..3f66f3752a2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ProjectManagement.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ProjectManagement.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/RunnableWithResult.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/RunnableWithResult.java
index 6ebca20a768..6ebca20a768 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/RunnableWithResult.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/RunnableWithResult.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java
index b58b188edc5..b58b188edc5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Stereotypes.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Stereotypes.java
index fdaefbed703..fdaefbed703 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Stereotypes.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Stereotypes.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/UMLTool.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/UMLTool.java
index 448fc15a77c..448fc15a77c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/UMLTool.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/UMLTool.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java
index ea3a43f07c7..ea3a43f07c7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/commands/AddMarteAndFcmProfile.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/commands/AddMarteAndFcmProfile.java
index 8371706e9c7..8371706e9c7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/commands/AddMarteAndFcmProfile.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/commands/AddMarteAndFcmProfile.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/commands/AddQompassModelLibs.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/commands/AddQompassModelLibs.java
index 94c6d34f0b9..94c6d34f0b9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/commands/AddQompassModelLibs.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/commands/AddQompassModelLibs.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java
index c66d45918b5..c66d45918b5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
index 595e5aba037..595e5aba037 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java
index a712642e584..a712642e584 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepPlanUtils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepPlanUtils.java
index f1f9b08d475..f1f9b08d475 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepPlanUtils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepPlanUtils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java
index 9d687ed40d1..9d687ed40d1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
index 45ae01fc3db..45ae01fc3db 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java
index 0c087999818..0c087999818 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java
index 62574661a24..62574661a24 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/ImplementationChooser.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/ImplementationChooser.java
index a80a4d4a5df..a80a4d4a5df 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/ImplementationChooser.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/ImplementationChooser.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java
index eaf07e3b0a7..eaf07e3b0a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
index 6e8f10248fc..6e8f10248fc 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java
index b62aa607bfe..b62aa607bfe 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/EmbeddingRule.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/EmbeddingRule.java
index 7427a38a21f..7427a38a21f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/EmbeddingRule.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/EmbeddingRule.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ExternalGenerator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ExternalGenerator.java
index 2094a2239f8..2094a2239f8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ExternalGenerator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ExternalGenerator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IEmbeddingRule.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IEmbeddingRule.java
index 72b573222ad..72b573222ad 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IEmbeddingRule.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IEmbeddingRule.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IExternalGenerator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IExternalGenerator.java
index df578fec3de..df578fec3de 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IExternalGenerator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IExternalGenerator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IInstanceConfigurator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IInstanceConfigurator.java
index fd2231f525d..fd2231f525d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IInstanceConfigurator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IInstanceConfigurator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IOOTrafo.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IOOTrafo.java
index df62ee1300a..df62ee1300a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IOOTrafo.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IOOTrafo.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IXtend.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IXtend.java
index 1028f6f2ac6..1028f6f2ac6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IXtend.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IXtend.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/InstanceConfigurator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/InstanceConfigurator.java
index 709c8236cd2..709c8236cd2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/InstanceConfigurator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/InstanceConfigurator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/OOTrafo.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/OOTrafo.java
index f96ccad4765..f96ccad4765 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/OOTrafo.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/OOTrafo.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/XtendGenerator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/XtendGenerator.java
index 9737559803b..9737559803b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/XtendGenerator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/XtendGenerator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java
index 1b948ff0cb6..1b948ff0cb6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerationOptions.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerationOptions.java
index 48230b2b987..48230b2b987 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerationOptions.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerationOptions.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/DepPlanListener.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/DepPlanListener.java
index f6773177432..f6773177432 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/DepPlanListener.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/DepPlanListener.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/InterfaceListener.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/InterfaceListener.java
index a7d4f962536..a7d4f962536 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/InterfaceListener.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/InterfaceListener.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ModelListener.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ModelListener.java
index 786dcd051c9..786dcd051c9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ModelListener.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ModelListener.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/OperationListener.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/OperationListener.java
index 4444a92fa73..4444a92fa73 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/OperationListener.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/OperationListener.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ParameterListener.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ParameterListener.java
index c810970ed15..c810970ed15 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ParameterListener.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ParameterListener.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PortListener.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PortListener.java
index 09039013ee7..09039013ee7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PortListener.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PortListener.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PostCopyListener.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PostCopyListener.java
index 967d4765bf0..967d4765bf0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PostCopyListener.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PostCopyListener.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PreCopyListener.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PreCopyListener.java
index d865c4a586e..d865c4a586e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PreCopyListener.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PreCopyListener.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/GenerateMakefile.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/GenerateMakefile.java
index e2c88564887..e2c88564887 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/GenerateMakefile.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/GenerateMakefile.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/ShowFiles.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/ShowFiles.java
index 2568c45a61d..2568c45a61d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/ShowFiles.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/ShowFiles.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties
index 332fca3462d..332fca3462d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/preferences/QompassPreferenceConstants.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/preferences/QompassPreferenceConstants.java
index 3b3f3c7d2a4..3b3f3c7d2a4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/preferences/QompassPreferenceConstants.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/preferences/QompassPreferenceConstants.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java
index 89659d326da..89659d326da 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompTypeSync.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompTypeSync.java
index 4bb5070b757..4bb5070b757 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompTypeSync.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompTypeSync.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/DepPlanSync.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/DepPlanSync.java
index 6dd0266179a..6dd0266179a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/DepPlanSync.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/DepPlanSync.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/InterfaceSync.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/InterfaceSync.java
index 66e85da0cb6..66e85da0cb6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/InterfaceSync.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/InterfaceSync.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/SyncBehaviorParameters.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/SyncBehaviorParameters.java
index 8cc35234e1d..8cc35234e1d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/SyncBehaviorParameters.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/SyncBehaviorParameters.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java
index 1a138465cb1..1a138465cb1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java
index dca6f447db3..dca6f447db3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PostTemplateInstantiationListener.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PostTemplateInstantiationListener.java
index 7fbbc0387db..7fbbc0387db 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PostTemplateInstantiationListener.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PostTemplateInstantiationListener.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PreTemplateInstantiationListener.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PreTemplateInstantiationListener.java
index eed7c3ddbb6..eed7c3ddbb6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PreTemplateInstantiationListener.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PreTemplateInstantiationListener.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java
index 2caa5bb8464..2caa5bb8464 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
index 0b31ae7efaf..0b31ae7efaf 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TextTemplateBinding.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TextTemplateBinding.java
index aa89bc58c8e..aa89bc58c8e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TextTemplateBinding.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TextTemplateBinding.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/XtendTemplateBinding.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/XtendTemplateBinding.java
index 14527c6aa23..14527c6aa23 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/XtendTemplateBinding.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/XtendTemplateBinding.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java
index 75dd752b1df..75dd752b1df 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java
index 60f563cdb58..60f563cdb58 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompTypeTrafos.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompTypeTrafos.java
index 4fa6256b36a..4fa6256b36a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompTypeTrafos.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompTypeTrafos.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java
index 7aa54599ebd..7aa54599ebd 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ExecuteOOTrafo.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ExecuteOOTrafo.java
index 17ae079d584..17ae079d584 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ExecuteOOTrafo.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ExecuteOOTrafo.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java
index 1d9cabc87c0..1d9cabc87c0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
index 5935d0ac8a4..f0a2d6c3a7d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
@@ -170,7 +170,7 @@ public class InstantiateDepPlan {
 	private void instantiate(IProgressMonitor monitor, int genOptions) {
 		try {
 			initialize(monitor, genOptions);
-			executeTransformationNew();
+			executeTransformation();
 		} catch (final TransformationException e) {
 			printAndDisplayErrorMessage(e,
 					Messages.InstantiateDepPlan_TransformationException, false);
@@ -191,7 +191,7 @@ public class InstantiateDepPlan {
 		RuleManagement.setConfiguration(configuration);
 	}
 
-	protected void executeTransformationNew() throws Exception {
+	protected void executeTransformation() throws Exception {
 		ModelManagement intermediateModelManagement = null;
 
 		// 1a: create a new model (and applies same profiles / imports)
@@ -265,90 +265,7 @@ public class InstantiateDepPlan {
 		intermediateModelManagement.dispose();
 	}
 
-	@Deprecated
-	protected void executeTransformation() throws Exception {
-		ModelManagement intermediateModelManagement = null;
-
-		InstanceSpecification mainInstance = DepUtils
-				.getMainInstance(srcModelComponentDeploymentPlan);
-		EList<InstanceSpecification> nodes = AllocUtils
-				.getAllNodes(mainInstance);
-
-		initiateProgressMonitor(generateCode, nodes);
-
-		// --------------------------------------------------------------------
-		checkProgressStatus();
-		// --------------------------------------------------------------------
-
-		// 1a: create a new model (and applies same profiles / imports)
-		Model existingModel = srcModelComponentDeploymentPlan.getModel();
-		TransformationContext.sourceRoot = existingModel;
-
-		intermediateModelManagement = createTargetModel(existingModel,
-				existingModel.getName(), true);
-
-		// Declare that the new model is a derivedElement (kind of hack,
-		// since the source element (attribute of derive element) remains
-		// undefined). This is used to deactivate automatic transformations
-		// that should not be applied to the generated model.
-
-		// --------------------------------------------------------------------
-		checkProgressStatus();
-		// --------------------------------------------------------------------
-
-		// get the temporary model
-		Model intermediateModel = intermediateModelManagement.getModel();
-
-		// create a package for global enumerations that are used by Acceleo code
-		EnumService.createEnumPackage(intermediateModel);
-
-		// create a lazy copier towards the intermediate model
-		LazyCopier intermediateModelCopier = new LazyCopier(existingModel, intermediateModel, false, true);
-		// add pre-copy and post-copy listeners to the copier
-		intermediateModelCopier.preCopyListeners.add(FilterTemplate.getInstance());
-
-		// 1b: reify the connectors "into" the new model
-		monitor.subTask(Messages.InstantiateDepPlan_InfoExpandingConnectors);
-
-		// obtain the component deployment plan in target model
-		Package intermediateModelComponentDeploymentPlan = (Package) intermediateModelCopier
-				.shallowCopy(srcModelComponentDeploymentPlan);
-		intermediateModelCopier.createShallowContainer(srcModelComponentDeploymentPlan);
-
-		AbstractContainerTrafo.init();
-		InstanceConfigurator.onNodeModel = false;
-		MainModelTrafo mainModelTrafo = new MainModelTrafo(intermediateModelCopier,
-				intermediateModelComponentDeploymentPlan);
-		InstanceSpecification newMainInstance = mainModelTrafo
-				.transformInstance(mainInstance, null);
-
-		// --------------------------------------------------------------------
-		checkProgressStatus();
-		// --------------------------------------------------------------------
-
-		TransformationUtil.applyInstanceConfigurators(newMainInstance);
-
-		FlattenInteractionComponents.getInstance().flattenAssembly(
-				newMainInstance, null);
-
-		TransformationUtil.propagateAllocation(newMainInstance);
-
-		intermediateModelManagement.saveModel(project, TEMP_MODEL_FOLDER,
-				TEMP_MODEL_POSTFIX);
-
-		// --------------------------------------------------------------------
-		checkProgressStatus();
-		// --------------------------------------------------------------------
-
-		if (!generateCACOnly) {
-			// deployOnNodes(mainInstance, existingModel, intermediateModel,
-			// newMainInstance);
-		}
-
-		intermediateModelManagement.dispose();
-	}
-
-	private void deployOnNodes(Map<InstanceSpecification, InstanceSpecification> instanceMap,
+private void deployOnNodes(Map<InstanceSpecification, InstanceSpecification> instanceMap,
 			Model existingModel, Model tmpModel)
 					throws TransformationException, InterruptedException {
 
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LazyCopier.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LazyCopier.java
index 9ce3514fce5..9ce3514fce5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LazyCopier.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LazyCopier.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
index 96feae630a5..f89e9dd930d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
@@ -45,6 +45,7 @@ import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
 import org.eclipse.papyrus.qompass.designer.core.templates.TemplateInstantiation;
 import org.eclipse.papyrus.qompass.designer.core.transformations.connector.ConnectorReification;
 import org.eclipse.papyrus.qompass.designer.core.transformations.container.ContainerTrafo;
+import org.eclipse.papyrus.qompass.designer.core.transformations.container.LWContainerTrafo;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PrefixConstants.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PrefixConstants.java
index 8cab7ddf4cf..8cab7ddf4cf 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PrefixConstants.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PrefixConstants.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/RuleManagement.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/RuleManagement.java
index 2692e06cb5a..2692e06cb5a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/RuleManagement.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/RuleManagement.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java
index 569f3f17512..9b68a2474e6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.qompass.designer.core.StUtils;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
 import org.eclipse.papyrus.qompass.designer.core.generate.GenerateCode;
+import org.eclipse.papyrus.qompass.designer.core.transformations.container.LWContainerTrafo;
 import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterTemplate;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationContext.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationContext.java
index 81f1b2a6bea..81f1b2a6bea 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationContext.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationContext.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationException.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationException.java
index b0331d9e98a..b0331d9e98a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationException.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationException.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationRTException.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationRTException.java
index 776cd6b3239..776cd6b3239 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationRTException.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationRTException.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationUtil.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationUtil.java
index d696183686e..d696183686e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationUtil.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationUtil.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java
index cdf8175be25..cdf8175be25 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/connector/ConnectorReification.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/connector/ConnectorReification.java
index 14511d3627f..14511d3627f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/connector/ConnectorReification.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/connector/ConnectorReification.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/container/ContainerTrafo.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/container/ContainerTrafo.java
index 927dee07143..927dee07143 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/container/ContainerTrafo.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/container/ContainerTrafo.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/container/LWContainerTrafo.java
index 220e9182c2b..adcba9d75fe 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/container/LWContainerTrafo.java
@@ -12,7 +12,7 @@
  *
  *****************************************************************************/
 
-package org.eclipse.papyrus.qompass.designer.core.transformations;
+package org.eclipse.papyrus.qompass.designer.core.transformations.container;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -32,7 +32,11 @@ import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator
 import org.eclipse.papyrus.qompass.designer.core.templates.TemplateInstantiation;
 import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
 import org.eclipse.papyrus.qompass.designer.core.templates.TextTemplateBinding;
+import org.eclipse.papyrus.qompass.designer.core.transformations.AbstractContainerTrafo;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
 import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier.CopyStatus;
+import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
+import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Behavior;
 import org.eclipse.uml2.uml.Class;
@@ -53,12 +57,10 @@ import org.eclipse.uml2.uml.profile.standard.Create;
 import org.eclipse.uml2.uml.profile.standard.Destroy;
 
 /**
- * A light-weight container transformation. Unlike the standard component-based transformation, this trafo does add a new class.
+ * A light-weight container transformation. Unlike the standard component-based transformation, this transformation does not add a new class.
  * It is target for standard object-oriented architecture, enabling in particular to intercept the methods of a class (instead of
  * adding interceptors to ports).
  *
- * @author ansgar
- *
  */
 public class LWContainerTrafo extends AbstractContainerTrafo {
 
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterRuleApplication.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterRuleApplication.java
index 93173286910..93173286910 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterRuleApplication.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterRuleApplication.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterSignatures.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterSignatures.java
index 69e040f9676..69e040f9676 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterSignatures.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterSignatures.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java
index bca7a5719a5..3111104d984 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java
@@ -52,9 +52,9 @@ public class FilterStateMachines implements PreCopyListener {
 					Behavior effect = transition.getEffect();
 					if (effect != null) {
 						if (tmClass != null) {
-							// String newName = sm.getName() + "_" + transition.getName() //$NON-NLS-1$
-							// 		+ "_" + effect.getName(); //$NON-NLS-1$
-							moveBehavior(effect.getName(), tmClass, effect);
+							String newName = sm.getName() + "_" + transition.getName() //$NON-NLS-1$
+							 		+ "_" + effect.getName(); //$NON-NLS-1$
+							moveBehavior(newName, tmClass, effect);
 						}
 					}
 				}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterTemplate.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterTemplate.java
index 288fc1ab64a..288fc1ab64a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterTemplate.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterTemplate.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java
index fdb7c64d06d..fdb7c64d06d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath
index 248b4c5dc7a..248b4c5dc7a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.project b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/.project
index e75a53b4f3e..e75a53b4f3e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.project
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/.project
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs
index f42de363afa..f42de363afa 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF
index a104bc94858..a104bc94858 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/about.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/about.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/about.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/build.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/build.properties
index 3fa3c740b2b..3fa3c740b2b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/build.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/build.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.properties
index 41efca52119..41efca52119 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.xml
index 7e269f6b934..7e269f6b934 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/pom.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/pom.xml
index 29fa1be894f..7ac5e5e3409 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/pom.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/pom.xml
@@ -5,7 +5,7 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.cpp</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Activator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Activator.java
index 8d1c38fcd87..8d1c38fcd87 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Activator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Activator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Constants.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Constants.java
index 546144c98e5..546144c98e5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Constants.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Constants.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Messages.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Messages.java
index ae3f8380e5b..ae3f8380e5b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Messages.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/Messages.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/messages.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/messages.properties
index c4c2141c7e6..c4c2141c7e6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/messages.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/messages.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/CppPortMapping.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/CppPortMapping.xtend
index 05dd7c50459..05dd7c50459 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/CppPortMapping.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/CppPortMapping.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/CppUtils.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/CppUtils.xtend
index 1d568623d14..1d568623d14 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/CppUtils.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/CppUtils.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/DynamicCpptoOO.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/DynamicCpptoOO.xtend
index 15a4477e2e4..15a4477e2e4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/DynamicCpptoOO.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/DynamicCpptoOO.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/StaticCppToOO.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/StaticCppToOO.xtend
index 4788177ede6..4788177ede6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/StaticCppToOO.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/xtend/StaticCppToOO.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/xtend-gen/.gitignore b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/xtend-gen/.gitignore
index c96a04f008e..c96a04f008e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/xtend-gen/.gitignore
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp/xtend-gen/.gitignore
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/.classpath b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/.classpath
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/.classpath
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.project b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/.project
index 95ded03ad32..95ded03ad32 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.project
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/.project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/.settings/org.eclipse.jdt.core.prefs
index f287d53cf45..c537b63063c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

-org.eclipse.jdt.core.compiler.compliance=1.6

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.6

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF
index d043db34c31..d043db34c31 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/about.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/about.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/about.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/build.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/build.properties
index 7ea784f3854..7ea784f3854 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/build.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/build.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/AddPorts.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/AddPorts.xml
index 59c01e6c693..59c01e6c693 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/AddPorts.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/AddPorts.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/CodeCompilation.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/CodeCompilation.xml
index a8de088de93..a8de088de93 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/CodeCompilation.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/CodeCompilation.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/CodeGeneration.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/CodeGeneration.xml
index 3de326cbd43..3de326cbd43 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/CodeGeneration.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/CodeGeneration.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentDev.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentDev.xml
index 242e723f337..242e723f337 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentDev.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentDev.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentImplementation.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentImplementation.xml
index 335fb27986a..335fb27986a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentImplementation.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentImplementation.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentModel.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentModel.xml
index 7af6183b976..7af6183b976 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentModel.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/ComponentModel.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/DeploymentPlan.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/DeploymentPlan.xml
index 726d08968d4..726d08968d4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/DeploymentPlan.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/DeploymentPlan.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/Main.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/Main.xml
index 7196d1103ef..7196d1103ef 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/Main.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/Main.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteAddComponents.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteAddComponents.xml
index f7ec40e7aa4..f7ec40e7aa4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteAddComponents.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteAddComponents.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteAddPorts.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteAddPorts.xml
index 38233bc7312..38233bc7312 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteAddPorts.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteAddPorts.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteMain.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteMain.xml
index e32ef8326fe..e32ef8326fe 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteMain.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteMain.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteNewModel.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteNewModel.xml
index dbbe1802e86..dbbe1802e86 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteNewModel.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/MarteNewModel.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/NewModel.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/NewModel.xml
index 68c3c72b990..68c3c72b990 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/NewModel.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/NewModel.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/OpenExample.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/OpenExample.xml
index e6e0d5537a6..e6e0d5537a6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/OpenExample.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/OpenExample.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/PlatformModel.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/PlatformModel.xml
index 894c7172939..894c7172939 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/PlatformModel.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/PlatformModel.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/Validation.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/Validation.xml
index d9822313b5d..d9822313b5d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/Validation.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/cheatsheet/Validation.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/help/index.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/help/index.xml
index 6ca8880c3dc..6ca8880c3dc 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/help/index.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/help/index.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/help/tocconcepts.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/help/tocconcepts.xml
index a70c9f0c946..a70c9f0c946 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/help/tocconcepts.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/help/tocconcepts.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/help/tocdevguide.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/help/tocdevguide.xml
index 254dbf34b5d..254dbf34b5d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/help/tocdevguide.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/help/tocdevguide.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/help/tocreference.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/help/tocreference.xml
index 7f27d062c18..7f27d062c18 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/help/tocreference.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/help/tocreference.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/bibliography.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/bibliography.html
index a5bec374c1b..a5bec374c1b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/bibliography.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/bibliography.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/codegen.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/codegen.html
index 37adce760f1..37adce760f1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/codegen.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/codegen.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/connector-container.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/connector-container.html
index 057bf4612d1..057bf4612d1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/connector-container.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/connector-container.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/input-models.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/input-models.html
index 1d910b4c70c..1d910b4c70c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/input-models.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/input-models.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/overview.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/overview.html
index 9148d7e6230..9148d7e6230 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/overview.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/concepts/overview.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/DefineNewPortKinds.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/DefineNewPortKinds.html
index 44b6609371a..44b6609371a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/DefineNewPortKinds.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/DefineNewPortKinds.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/createContainers.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/createContainers.html
index 7c9b1ec491e..7c9b1ec491e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/createContainers.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/createContainers.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/createInteractionComponents.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/createInteractionComponents.html
index d6a0c24d682..d6a0c24d682 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/createInteractionComponents.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/createInteractionComponents.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/developer.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/developer.html
index 419936e9f52..419936e9f52 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/developer.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/developer.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/org.eclipse.papyrus.qompass.designer.core.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/org.eclipse.papyrus.qompass.designer.core.html
index 2136ae652a7..2136ae652a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/org.eclipse.papyrus.qompass.designer.core.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/developer-guide/org.eclipse.papyrus.qompass.designer.core.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/arrow.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/arrow.png
index 1c66a6d427d..1c66a6d427d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/arrow.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/arrow.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-after-trafo.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-after-trafo.png
index aae501c9e90..aae501c9e90 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-after-trafo.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-after-trafo.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-before-trafo.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-before-trafo.png
index 04595b063cb..04595b063cb 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-before-trafo.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-before-trafo.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-selection.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-selection.png
index 3e60881270c..3e60881270c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-selection.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/connector-selection.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-aggregation.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-aggregation.png
index 9f98f79e705..9f98f79e705 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-aggregation.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-aggregation.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-connector.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-connector.png
index 73cbaea6fa4..73cbaea6fa4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-connector.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-connector.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-interceptor.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-interceptor.png
index 88d630ba405..88d630ba405 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-interceptor.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-interceptor.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-interceptor2.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-interceptor2.png
index 82a0a5031f3..82a0a5031f3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-interceptor2.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-interceptor2.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-selection.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-selection.png
index 0ee528ca514..0ee528ca514 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-selection.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/container-selection.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/deployment.pdf b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/deployment.pdf
index 7fd5e843362..7fd5e843362 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/deployment.pdf
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/deployment.pdf
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/deployment.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/deployment.png
index b0ae3117501..b0ae3117501 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/deployment.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/deployment.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-flex-eWare-small.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-flex-eWare-small.png
index 42ad4899399..42ad4899399 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-flex-eWare-small.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-flex-eWare-small.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-marte.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-marte.png
index d33ef562b5f..d33ef562b5f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-marte.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-marte.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-papyrus.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-papyrus.png
index f85045926f3..f85045926f3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-papyrus.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/logo-papyrus.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.odg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.odg
index a38a594fb7b..a38a594fb7b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.odg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.odg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.pdf b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.pdf
index a615fa7ce91..a615fa7ce91 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.pdf
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.pdf
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.png
index d22ad2fb51c..d22ad2fb51c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.vsd b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.vsd
index a274050ab84..a274050ab84 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.vsd
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/overview-eng.vsd
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/qompass-0.33.jpg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/qompass-0.33.jpg
index 8c429f9dc5e..8c429f9dc5e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/qompass-0.33.jpg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/qompass-0.33.jpg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/qompass.jpg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/qompass.jpg
index 26807d913e4..26807d913e4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/qompass.jpg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/qompass.jpg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-after-trafo.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-after-trafo.png
index c19b14f091a..c19b14f091a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-after-trafo.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-after-trafo.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-before-trafo.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-before-trafo.png
index 3568e8e8e08..3568e8e8e08 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-before-trafo.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-before-trafo.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-selection.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-selection.png
index 0cf9151893c..0cf9151893c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-selection.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/connector-selection.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-aggregation.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-aggregation.png
index 2f260c5498b..2f260c5498b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-aggregation.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-aggregation.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-interceptor.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-interceptor.png
index 43c3f8b4edf..43c3f8b4edf 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-interceptor.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-interceptor.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-interceptor2.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-interceptor2.png
index 10b73141e50..10b73141e50 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-interceptor2.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-interceptor2.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-selection.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-selection.png
index b8a372f44cd..b8a372f44cd 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-selection.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/scaled/container-selection.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/statemachine-rule.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/statemachine-rule.png
index 2754cb16625..2754cb16625 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/statemachine-rule.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/statemachine-rule.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/toolchain.odg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/toolchain.odg
index c752e963472..c752e963472 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/toolchain.odg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/toolchain.odg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/toolchain.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/toolchain.png
index 68442484be3..68442484be3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/toolchain.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/toolchain.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/trace2.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/trace2.png
index e8c9820c4c7..e8c9820c4c7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/img/trace2.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/img/trace2.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/component.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/component.html
index fb6364efedb..fb6364efedb 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/component.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/component.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/container.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/container.html
index 73aaa3d3443..73aaa3d3443 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/container.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/container.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/interactionComponent.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/interactionComponent.html
index 98391302fba..98391302fba 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/interactionComponent.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/interactionComponent.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/port.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/port.html
index dc0c832a6c7..dc0c832a6c7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/port.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/port.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/portKind.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/portKind.html
index 983c6983f58..983c6983f58 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/portKind.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/portKind.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/trafos.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/trafos.html
index 27ad089bcb9..27ad089bcb9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/trafos.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/reference/trafos.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/sitestyle.css b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/sitestyle.css
index 4f5bb078d99..4f5bb078d99 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/html/sitestyle.css
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/html/sitestyle.css
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.di
index 63bf1a9db4a..63bf1a9db4a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.notation
index 5c943021045..5c943021045 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.uml
index 30494c484ee..30494c484ee 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/model/ec3m-transformations.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/plugin.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/plugin.properties
index 1fccb2ec96f..1fccb2ec96f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/plugin.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/plugin.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/plugin.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/plugin.xml
index 860a13a3743..860a13a3743 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/plugin.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/plugin.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/pom.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/pom.xml
index 9f74566da65..623d0668a17 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/pom.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/src/org/eclipse/papyrus/qompass/designer/doc/Activator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/src/org/eclipse/papyrus/qompass/designer/doc/Activator.java
index dd7f6fbd95a..dd7f6fbd95a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/src/org/eclipse/papyrus/qompass/designer/doc/Activator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/src/org/eclipse/papyrus/qompass/designer/doc/Activator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/toc.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/toc.xml
index 1f47f46e81f..1f47f46e81f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/toc.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc/toc.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/.classpath b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/.classpath
index 248b4c5dc7a..248b4c5dc7a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/.classpath
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/.classpath
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/.project b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/.project
index 49ba9131ad8..49ba9131ad8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/.project
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/.project
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/.settings/org.eclipse.jdt.core.prefs
index f42de363afa..f42de363afa 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/META-INF/MANIFEST.MF
index 9a5c0239ad2..9a5c0239ad2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/META-INF/MANIFEST.MF
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/about.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/about.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/about.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/build.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/build.properties
index 3fa3c740b2b..3fa3c740b2b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/build.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/build.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/plugin.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/plugin.properties
index 5c6ac578195..5c6ac578195 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/plugin.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/plugin.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/plugin.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/plugin.xml
index 325c6bd80d0..325c6bd80d0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/plugin.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/plugin.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/pom.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/pom.xml
index f1ba7db6b51..1bfee6eff52 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/pom.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/pom.xml
@@ -5,7 +5,7 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.java</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/Activator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/Activator.java
index 1e7d5e25650..1e7d5e25650 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/Activator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/Activator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/Messages.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/Messages.java
index 070d1956590..070d1956590 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/Messages.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/Messages.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/messages.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/messages.properties
index c4c2141c7e6..c4c2141c7e6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/messages.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/messages.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/xtend/JavaToOO.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/xtend/JavaToOO.xtend
index ef368eb0d76..ef368eb0d76 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/xtend/JavaToOO.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/src/org/eclipse/papyrus/qompass/designer/java/xtend/JavaToOO.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/xtend-gen/.gitignore b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/xtend-gen/.gitignore
index c96a04f008e..c96a04f008e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java/xtend-gen/.gitignore
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java/xtend-gen/.gitignore
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.classpath b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.classpath
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/.classpath
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/.project b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/.project
index ee60ec6da05..ee60ec6da05 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/.project
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/.project
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/.settings/org.eclipse.jdt.core.prefs
index f42de363afa..f42de363afa 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF
index 972085ecb3b..e34e95512eb 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",

- org.eclipse.papyrus.qompass.designer.core;bundle-version="1.2.0"

+ org.eclipse.papyrus.qompass.designer.core;bundle-version="1.2.0",

+ org.eclipse.papyrus.qompass.ui;bundle-version="1.2.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/about.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/about.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/build.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/build.properties
index f1e29af020a..f1e29af020a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/build.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/build.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/ADLInFlowPort.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/ADLInFlowPort.gif
index e2b32c65cac..e2b32c65cac 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/ADLInFlowPort.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/ADLInFlowPort.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif
index c47d52ad211..c47d52ad211 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/Stereotype.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/Stereotype.gif
index 145e5d589d8..145e5d589d8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/Stereotype.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/Stereotype.gif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/icons/allocation.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/allocation.gif
index ced634f9c9c..ced634f9c9c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/icons/allocation.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/allocation.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/depPlan.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/depPlan.gif
index 712a2485f8d..712a2485f8d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/depPlan.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/depPlan.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/deploy.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/deploy.gif
index 7a7ced35f3d..7a7ced35f3d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/icons/deploy.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/deploy.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/ec3m-16x16.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/ec3m-16x16.gif
index 327caa73f59..327caa73f59 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/ec3m-16x16.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/ec3m-16x16.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/ec3m-32x32.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/ec3m-32x32.gif
index 9e1527b778f..9e1527b778f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/ec3m-32x32.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/ec3m-32x32.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/sample.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/sample.gif
index 34fb3c9d8cb..34fb3c9d8cb 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/sample.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/sample.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/selConnector.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/selConnector.gif
index e47528e5447..e47528e5447 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/selConnector.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/selConnector.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/selContainer.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/selContainer.gif
index c16516c624b..c16516c624b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/selContainer.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/selContainer.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/sync.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/sync.gif
index 5935eb3cbba..5935eb3cbba 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/icons/sync.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/icons/sync.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/plugin.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/plugin.properties
index 09415057ea6..09415057ea6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/plugin.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/plugin.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/plugin.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/plugin.xml
index 8df44b89c05..a90ac73c900 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/plugin.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/plugin.xml
@@ -84,31 +84,14 @@
    <extension
          point="org.eclipse.ui.menus">
 	<menuContribution
-		allPopups="true"
-		locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
-		<menu
-			icon="icons/Qompass-16x16.gif"
-			id="org.eclipse.papyrus.views.modelexplorer.popup.qompassdesigner"
-			label="Qompass Designer">
-		</menu>
-	</menuContribution>
-	<menuContribution
-		allPopups="true"
-		locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">
-		<menu
-			icon="icons/Qompass-16x16.gif"
-			id="org.eclipse.papyrus.views.modelexplorer.popup.qompassdesigner"
-			label="Qompass Designer">
-		</menu>
-	</menuContribution>
-	<menuContribution
 		allPopups="false"
-		locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popup.qompassdesigner">
+		locationURI="popup:org.eclipse.papyrus.qompass.popup?after=designer">
 		<command
                commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.CreateDepPlanCmd"
-               icon="icons/depPlan.gif"
+               icon="icons/depPlan.gif"   
+               
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.CreateDepPlanMenu"
-               label="Qompass: Create deployment plan"
+               label="Create deployment plan"
                mnemonic="d"
                mode="FORCE_TEXT"
                style="push">
@@ -120,7 +103,7 @@
                commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.CreatePlatformCmd"
                icon="icons/depPlan.gif"
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.CreatePlatformMenu"
-               label="Qompass: Create platform definition"
+               label="Create platform definition"
                mnemonic="d"
                mode="FORCE_TEXT"
                style="push">
@@ -132,7 +115,7 @@
                commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.SyncCmd"
                icon="icons/sync.gif"
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.SyncMenu"
-               label="Qompass: Synchronize derived elements"
+               label="Synchronize derived elements"
                mnemonic="s"
                mode="FORCE_TEXT"
                style="push">
@@ -144,7 +127,7 @@
                commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.InstantiateDepPlanCmd"
                icon="icons/deploy.gif"
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.CreateDepPlanMenu"
-               label="Qompass: Generate deployment models and code from plan"
+               label="Generate deployment models and code from plan"
                mnemonic="g"
                mode="FORCE_TEXT"
                style="push">
@@ -156,7 +139,7 @@
                commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.SelectionConnectorCmd"
                icon="icons/selConnector.gif"
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.SelectionConnectorMenu"
-               label="Qompass: Show / choose connector type and implementation"
+               label="Show / choose connector type and implementation"
                mnemonic="C"
                mode="FORCE_TEXT"
                style="push">
@@ -168,7 +151,7 @@
                commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.SelectionContainerCmd"
                icon="icons/selContainer.gif"
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.SelectionContainerMenu"
-               label="Qompass: Show / choose container properties"
+               label="Show / choose container properties"
                mode="FORCE_TEXT"
                style="push">
             <visibleWhen
@@ -179,7 +162,7 @@
                commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.ConfigureInstanceCmd"
                icon="icons/selContainer.gif"
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.ConfigureInstanceMenu"
-               label="Qompass: Configure instance properties"
+               label="Configure instance properties"
                mode="FORCE_TEXT"
                style="push">
             <visibleWhen
@@ -190,7 +173,7 @@
                commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.ConfigurePortsCmd"
                icon="icons/selContainer.gif"
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.ConfigurePortsMenu"
-               label="Qompass: Configure ports"
+               label="Configure ports"
                style="push">
             <visibleWhen
                   checkEnabled="true">
@@ -200,7 +183,7 @@
                commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.AddProfileAndModelLibsCmd"
                icon="icons/Stereotype.gif"
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.AddProfileAndModelLibsMenu"
-               label="Qompass: Add profiles and model libraries"
+               label="Add profiles and model libraries"
                mnemonic="P"
                style="push">
             <visibleWhen
@@ -211,7 +194,7 @@
                commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.AllocateCmd"
                icon="icons/allocation.gif"
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.AllocateMenu"
-               label="Qompass: Allocate to node"
+               label="Allocate to node"
                mnemonic="A"
                style="push">
             <visibleWhen
@@ -222,7 +205,7 @@
                commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.TrafoAndCodegenCmd"
                icon="icons/deploy.gif"
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.TrafoAndCodegenCmd"
-               label="Qompass: Execute transformation and generate code (w/o deployment)"
+               label="Execute transformation and generate code (w/o deployment)"
                style="push">
             <visibleWhen
                   checkEnabled="true">
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/pom.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/pom.xml
index 9745a959a48..c6fffb7c021 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/pom.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Activator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Activator.java
index 54b1369473a..54b1369473a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Activator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Activator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Messages.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Messages.java
index 53794a9743b..53794a9743b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Messages.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Messages.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java
index 14a3e457d49..14a3e457d49 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AttributeLabelProvider.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AttributeLabelProvider.java
index 568acd2541f..568acd2541f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AttributeLabelProvider.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AttributeLabelProvider.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ChooseConfigOpt.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ChooseConfigOpt.java
index 8c2b5f6cda9..8c2b5f6cda9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ChooseConfigOpt.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ChooseConfigOpt.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ChoosePorts.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ChoosePorts.java
index df3f4e3e44f..df3f4e3e44f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ChoosePorts.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ChoosePorts.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigOptionLabelProvider.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigOptionLabelProvider.java
index ec588505f20..ec588505f20 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigOptionLabelProvider.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigOptionLabelProvider.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java
index f5deb6de56c..f5deb6de56c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigurePortDialog.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigurePortDialog.java
index 7f8bc62475a..7f8bc62475a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigurePortDialog.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigurePortDialog.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConnectorSelectionDialog.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConnectorSelectionDialog.java
index 1652acc7663..1652acc7663 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConnectorSelectionDialog.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConnectorSelectionDialog.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ContainerDialog.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ContainerDialog.java
index 32a4bc5881d..32a4bc5881d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ContainerDialog.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ContainerDialog.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/GenerationOptionsDialog.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/GenerationOptionsDialog.java
index fd6fc3d2116..fd6fc3d2116 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/GenerationOptionsDialog.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/GenerationOptionsDialog.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/InstanceLabelProvider.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/InstanceLabelProvider.java
index 72ed1a737f8..72ed1a737f8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/InstanceLabelProvider.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/InstanceLabelProvider.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/InteractiveImplementationChooser.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/InteractiveImplementationChooser.java
index bfdcf2d7040..bfdcf2d7040 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/InteractiveImplementationChooser.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/InteractiveImplementationChooser.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/NameLabelProvider.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/NameLabelProvider.java
index fcf8a51c82c..fcf8a51c82c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/NameLabelProvider.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/NameLabelProvider.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/PortLabelProvider.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/PortLabelProvider.java
index b94bcf1bfca..b94bcf1bfca 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/PortLabelProvider.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/PortLabelProvider.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/QNameLabelProvider.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/QNameLabelProvider.java
index 0bc904fc210..0bc904fc210 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/QNameLabelProvider.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/QNameLabelProvider.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/RuleLabelProvider.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/RuleLabelProvider.java
index 853eaa092b7..853eaa092b7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/RuleLabelProvider.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/RuleLabelProvider.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java
index 588f0bc84de..588f0bc84de 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AllocateHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AllocateHandler.java
index dd517e153c9..dd517e153c9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AllocateHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AllocateHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java
index 969ecd1d367..969ecd1d367 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java
index 3dcbc83e054..3dcbc83e054 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java
index 6ff9c26c533..6ff9c26c533 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java
index 22dc6281a47..22dc6281a47 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenCollaborationUseHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenCollaborationUseHandler.java
index 614bc5b139e..614bc5b139e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenCollaborationUseHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenCollaborationUseHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenConnectionPatternHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenConnectionPatternHandler.java
index 5b56d15f739..5b56d15f739 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenConnectionPatternHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenConnectionPatternHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java
index 0c16e370d42..0c16e370d42 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectConnectorHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectConnectorHandler.java
index 0dc3eb1607f..0dc3eb1607f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectConnectorHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectConnectorHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectContainerHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectContainerHandler.java
index dd7771eea86..dd7771eea86 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectContainerHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectContainerHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SyncHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SyncHandler.java
index 93708d5888e..93708d5888e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SyncHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SyncHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java
index f129bdaa807..f129bdaa807 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/messages.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/messages.properties
index 40a457cfc83..40a457cfc83 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/messages.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/messages.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/preferences/QompassPreferenceInitializer.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/preferences/QompassPreferenceInitializer.java
index f28c634a309..f28c634a309 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/preferences/QompassPreferenceInitializer.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/preferences/QompassPreferenceInitializer.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/preferences/QompassPreferencePage.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/preferences/QompassPreferencePage.java
index c5552e6020b..c5552e6020b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/preferences/QompassPreferencePage.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/preferences/QompassPreferencePage.java
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/.classpath b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/.classpath
new file mode 100644
index 00000000000..ad32c83a788
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/.project b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/.project
index 896877fb61f..896877fb61f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/.project
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/.project
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF
index d110843ec77..d110843ec77 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/about.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/about.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/about.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/build.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/build.properties
index 1d9f30169a4..1d9f30169a4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/build.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/build.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/icons/validate.gif b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/icons/validate.gif
index 6efaebec95b..6efaebec95b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/icons/validate.gif
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/icons/validate.gif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/plugin.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/plugin.properties
index 348b2b9b363..348b2b9b363 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/plugin.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/plugin.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/plugin.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/plugin.xml
index 96f6b43d98c..96f6b43d98c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/plugin.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/plugin.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/pom.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/pom.xml
index ddc663180e8..e98e82171b2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/pom.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.validation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/Activator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/Activator.java
index 00051315823..00051315823 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/Activator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/Activator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/ValidationDelegateClientSelector.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/ValidationDelegateClientSelector.java
index 2bea425443b..2bea425443b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/ValidationDelegateClientSelector.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/ValidationDelegateClientSelector.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/AggregationKindValid.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/AggregationKindValid.java
index 60364005ae4..60364005ae4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/AggregationKindValid.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/AggregationKindValid.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/BehaviorsWithoutSpecification.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/BehaviorsWithoutSpecification.java
index 87d2b7457f6..87d2b7457f6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/BehaviorsWithoutSpecification.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/BehaviorsWithoutSpecification.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConfigurationAttributeNotSet.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConfigurationAttributeNotSet.java
index 87c6f1cb141..87c6f1cb141 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConfigurationAttributeNotSet.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConfigurationAttributeNotSet.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorCallMultiplicity.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorCallMultiplicity.java
index 104f433063d..104f433063d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorCallMultiplicity.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorCallMultiplicity.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorConnectable.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorConnectable.java
index 922347bee07..922347bee07 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorConnectable.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorConnectable.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/DuplicateOperation.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/DuplicateOperation.java
index 5989e9ce81f..5989e9ce81f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/DuplicateOperation.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/DuplicateOperation.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ExecutorIsNotUsedAsPartName.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ExecutorIsNotUsedAsPartName.java
index a9fe37c6179..a9fe37c6179 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ExecutorIsNotUsedAsPartName.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ExecutorIsNotUsedAsPartName.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InitialEntryPoints.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InitialEntryPoints.java
index ab3bca9e717..ab3bca9e717 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InitialEntryPoints.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InitialEntryPoints.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InstanceSpecificationSlotForAllProperties.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InstanceSpecificationSlotForAllProperties.java
index a3552545253..a3552545253 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InstanceSpecificationSlotForAllProperties.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InstanceSpecificationSlotForAllProperties.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/OperationsAreImplemented.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/OperationsAreImplemented.java
index 5c14d09c256..5c14d09c256 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/OperationsAreImplemented.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/OperationsAreImplemented.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/OperationsWithTwoReturnValues.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/OperationsWithTwoReturnValues.java
index a08f010803c..a08f010803c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/OperationsWithTwoReturnValues.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/OperationsWithTwoReturnValues.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/PortIsCorrectlyTyped.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/PortIsCorrectlyTyped.java
index 345678cc7df..345678cc7df 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/PortIsCorrectlyTyped.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/PortIsCorrectlyTyped.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/PortKindUnset.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/PortKindUnset.java
index 3aefcba3cd7..3aefcba3cd7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/PortKindUnset.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/PortKindUnset.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/SystemHasNoPorts.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/SystemHasNoPorts.java
index dd2bcc2a892..dd2bcc2a892 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/SystemHasNoPorts.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/SystemHasNoPorts.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/TemplateRefWithoutBinding.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/TemplateRefWithoutBinding.java
index 77fd10d61e6..77fd10d61e6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/TemplateRefWithoutBinding.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/TemplateRefWithoutBinding.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedPorts.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedPorts.java
index 34a4672aa66..34a4672aa66 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedPorts.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedPorts.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedProvPorts.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedProvPorts.java
index 81bf5bc64b6..81bf5bc64b6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedProvPorts.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedProvPorts.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedReqPorts.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedReqPorts.java
index d24a9f3f9f2..d24a9f3f9f2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedReqPorts.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedReqPorts.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/.classpath b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/.classpath
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/.classpath
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.project b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/.project
index 65bf34f1f4e..65bf34f1f4e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.project
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/.project
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/.settings/org.eclipse.jdt.core.prefs
index f42de363afa..f42de363afa 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF
index 7f958871f83..7f958871f83 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/about.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/about.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/build.acceleo b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/build.acceleo
index fb14dcfe540..fb14dcfe540 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/build.acceleo
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/build.acceleo
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/build.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/build.properties
index 2db90a70738..2db90a70738 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/build.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/build.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/plugin.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/plugin.properties
index e8db6a299e0..e8db6a299e0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/plugin.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/plugin.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/pom.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/pom.xml
index 91c022883c7..2ca86b4cb50 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/pom.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.vsl</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Activator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Activator.java
index d69dc572821..d69dc572821 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Activator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Activator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Messages.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Messages.java
index 548e47b0be1..548e47b0be1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Messages.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Messages.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.emtl b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.emtl
index 7e3a06641ae..7e3a06641ae 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.emtl
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.emtl
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java
index a4e1c54e504..a4e1c54e504 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.mtl b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.mtl
index 9713fa32611..9713fa32611 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.mtl
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.mtl
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/messages.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/messages.properties
index 115d3394041..115d3394041 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/messages.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/messages.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.classpath b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/.classpath
index 358df1bc1d1..358df1bc1d1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.classpath
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/.classpath
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.gitignore b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/.gitignore
index 5500bf75774..5500bf75774 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.gitignore
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/.gitignore
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.project b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/.project
index 748b00bc5a7..748b00bc5a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.project
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/.project
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/ExtendedPort.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/ExtendedPort.java
index 7227b1bdcc7..7227b1bdcc7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/ExtendedPort.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/ExtendedPort.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
index 40d9df64cb6..40d9df64cb6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/about.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/about.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/about.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/build.properties
index 4454371265c..4454371265c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/build.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/help/modellibs-core-examples.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/help/modellibs-core-examples.xml
index 8e2820fd43f..8e2820fd43f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/help/modellibs-core-examples.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/help/modellibs-core-examples.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/help/modellibs-core-library.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/help/modellibs-core-library.xml
index 78e5563a605..78e5563a605 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/help/modellibs-core-library.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/help/modellibs-core-library.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/hello-world.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/hello-world.html
index a8aacf1106c..a8aacf1106c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/hello-world.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/hello-world.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/producer-consumer.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/producer-consumer.html
index c7a619f5516..c7a619f5516 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/producer-consumer.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/producer-consumer.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/cmd_with_error.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/cmd_with_error.png
index b239ab329eb..b239ab329eb 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/cmd_with_error.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/cmd_with_error.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/cmd_without_error.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/cmd_without_error.png
index a03d922c087..a03d922c087 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/cmd_without_error.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/cmd_without_error.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/allocate.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/allocate.png
index 43f70204412..43f70204412 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/allocate.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/allocate.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/c-cpp-view.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/c-cpp-view.png
index c4cc6730243..c4cc6730243 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/c-cpp-view.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/c-cpp-view.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/configure-instance.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/configure-instance.png
index a77b9c3cbcf..a77b9c3cbcf 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/configure-instance.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/configure-instance.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/deployment-plan.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/deployment-plan.png
index 969c3b0d62c..969c3b0d62c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/deployment-plan.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/deployment-plan.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/hello-world.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/hello-world.png
index 78d176b6fa7..78d176b6fa7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/hello-world.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/hello-world.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/platform.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/platform.png
index 93f8f332b2a..93f8f332b2a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/platform.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/platform.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/system.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/system.png
index 10446c73b5c..10446c73b5c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/system.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/hw/system.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/dep-plans.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/dep-plans.png
index 9d5c201fd60..9d5c201fd60 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/dep-plans.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/dep-plans.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/generated-container.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/generated-container.png
index 4eb00727977..4eb00727977 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/generated-container.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/generated-container.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/pull-consumer.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/pull-consumer.png
index 950ad42d68c..950ad42d68c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/pull-consumer.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/pull-consumer.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/push-consumer.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/push-consumer.png
index 83065ace195..83065ace195 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/push-consumer.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/push-consumer.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/push-producer.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/push-producer.png
index 580db31e964..580db31e964 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/push-producer.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/push-producer.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/system-pull.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/system-pull.png
index 08d5286e66a..08d5286e66a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/system-pull.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/system-pull.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/system-push.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/system-push.png
index 1c3ce96ad33..1c3ce96ad33 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/system-push.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/examples/screenshots/pc/system-push.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/corba.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/corba.html
index 266c64ef4d2..266c64ef4d2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/corba.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/corba.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/core.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/core.html
index 038fd213f27..038fd213f27 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/core.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/core.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/osal.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/osal.html
index 038fd213f27..038fd213f27 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/osal.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/osal.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/statemachine.html b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/statemachine.html
index 038fd213f27..038fd213f27 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/statemachine.html
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/html/library/statemachine.html
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation
index f2f19151607..f2f19151607 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml
index 55d57426110..55d57426110 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.notation
index 6cef3afec90..78d43a4a70a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_7kc7YM__Ed-TP80eVS-2Rg" type="CompositeStructure" name="HelloWorldComponent" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_8LSR4M__Ed-TP80eVS-2Rg" type="2073" fontName="" fontHeight="10" fillColor="8905185" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8LSR4s__Ed-TP80eVS-2Rg" source="ShadowFigure">
@@ -11,13 +11,6 @@
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8LS48s__Ed-TP80eVS-2Rg" source="QualifiedName">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8LS488__Ed-TP80eVS-2Rg" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HIdDoJZ9EeCiU5xXzp1cKQ" source="Stereotype_Annotation">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HT--MJZ9EeCiU5xXzp1cKQ" key="StereotypeWithQualifiedNameList" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HT--MZZ9EeCiU5xXzp1cKQ" key="StereotypeList" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HT--MpZ9EeCiU5xXzp1cKQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HT--M5Z9EeCiU5xXzp1cKQ" key="PropStereoDisplay" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HT--NJZ9EeCiU5xXzp1cKQ" key="StereotypePropertyLocation" value="Compartment"/>
-      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_8LS49M__Ed-TP80eVS-2Rg" type="5156"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_8LS49c__Ed-TP80eVS-2Rg" type="7073">
         <children xmi:type="notation:Shape" xmi:id="_8rDfAFTzEeKvFeqt5Q_lqw" type="3070" fontName="Sans Serif" lineColor="0">
@@ -30,13 +23,6 @@
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8rGiVFTzEeKvFeqt5Q_lqw" source="QualifiedName">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8rGiVVTzEeKvFeqt5Q_lqw" key="QualifiedNameDepth" value="1000"/>
           </eAnnotations>
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KU4xwFT0EeKvFeqt5Q_lqw" source="Stereotype_Annotation">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KU4xwVT0EeKvFeqt5Q_lqw" key="StereotypeWithQualifiedNameList" value=""/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KU5Y0FT0EeKvFeqt5Q_lqw" key="StereotypeList" value="FCM::ConfigurationProperty"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KU5Y0VT0EeKvFeqt5Q_lqw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KU5Y0lT0EeKvFeqt5Q_lqw" key="PropStereoDisplay" value=""/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KU5Y01T0EeKvFeqt5Q_lqw" key="StereotypePropertyLocation" value="Compartment"/>
-          </eAnnotations>
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4k6AsHk1EeOph7IIHUnNoA" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4k7O0Hk1EeOph7IIHUnNoA" key="fillColor" value="true"/>
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4urnwHk1EeOph7IIHUnNoA" key="gradient" value="true"/>
@@ -50,9 +36,20 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_8rHJYlTzEeKvFeqt5Q_lqw" showTitle="true"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8rHJY1TzEeKvFeqt5Q_lqw"/>
           </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_p2fBUrYoEeWaTqnU44XdvA" type="6054">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_p2fBU7YoEeWaTqnU44XdvA" y="5"/>
+          </children>
           <element xmi:type="uml:Property" href="HelloWorld.uml#_8pupUFTzEeKvFeqt5Q_lqw"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8rDfAVTzEeKvFeqt5Q_lqw" x="40" y="30" width="163"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_qF26ELYoEeWaTqnU44XdvA" type="StereotypeComment">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_qF26EbYoEeWaTqnU44XdvA" showTitle="true"/>
+          <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qF26E7YoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+            <eObjectValue xmi:type="uml:Property" href="HelloWorld.uml#_8pupUFTzEeKvFeqt5Q_lqw"/>
+          </styles>
+          <element xsi:nil="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qF26ErYoEeWaTqnU44XdvA" x="240" y="30"/>
+        </children>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8LS49s__Ed-TP80eVS-2Rg"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_O7kMQFWUEeKdxoQIVxFNNg" visible="false" type="AppliedStereotypeCompartement">
@@ -64,18 +61,11 @@
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Ue-EFWUEeKdxoQIVxFNNg" source="ShadowFigure">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Ue-EVWUEeKdxoQIVxFNNg" key="ShadowFigure_Value" value="false"/>
         </eAnnotations>
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Ue-ElWUEeKdxoQIVxFNNg" source="displayNameLabelIcon">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Ue-E1WUEeKdxoQIVxFNNg" key="displayNameLabelIcon_value" value="false"/>
-        </eAnnotations>
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Ue-FFWUEeKdxoQIVxFNNg" source="QualifiedName">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6UflIFWUEeKdxoQIVxFNNg" key="QualifiedNameDepth" value="1000"/>
         </eAnnotations>
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9gHMkFWUEeKdxoQIVxFNNg" source="Stereotype_Annotation">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kH0ToLkXEeS7TYMQS2xzng" key="StereotypeWithQualifiedNameList" value=""/>
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kH0TobkXEeS7TYMQS2xzng" key="StereotypeList" value="FCM::Port"/>
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kH0TorkXEeS7TYMQS2xzng" key="PropStereoDisplay" value="FCM::Port.kind"/>
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kH0To7kXEeS7TYMQS2xzng" key="Stereotype_Presentation_Kind" value="IconStereotype"/>
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kH0TpLkXEeS7TYMQS2xzng" key="StereotypePropertyLocation" value="Compartment"/>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6kEY8LYoEeWaTqnU44XdvA" source="displayNameLabelIcon">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6kEY8bYoEeWaTqnU44XdvA" key="displayNameLabelIcon_value" value="true"/>
         </eAnnotations>
         <children xmi:type="notation:DecorationNode" xmi:id="_6UflIVWUEeKdxoQIVxFNNg" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_6UflIlWUEeKdxoQIVxFNNg" x="25" y="3"/>
@@ -83,6 +73,12 @@
         <children xmi:type="notation:DecorationNode" xmi:id="_6UflI1WUEeKdxoQIVxFNNg" visible="false" type="6029">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_6UflJFWUEeKdxoQIVxFNNg" x="25" y="-10"/>
         </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_qG7RELYoEeWaTqnU44XdvA" type="StereotypeBrace">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_qG7REbYoEeWaTqnU44XdvA" showTitle="true"/>
+          <styles xmi:type="notation:StringValueStyle" xmi:id="_qG7RErYoEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Port"/>
+          <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_pP-ckMtqEd2H_o0jIC6qDQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qG74ILYoEeWaTqnU44XdvA"/>
+        </children>
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_fV6D0LkXEeS7TYMQS2xzng" name="maskLabel">
           <stringListValue>multiplicity</stringListValue>
           <stringListValue>name</stringListValue>
@@ -92,8 +88,16 @@
         <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6UeXAVWUEeKdxoQIVxFNNg" y="31"/>
       </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_p2fBULYoEeWaTqnU44XdvA" type="6089">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_p2fBUbYoEeWaTqnU44XdvA" y="5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qEMGILYoEeWaTqnU44XdvA" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_qEMGIbYoEeWaTqnU44XdvA" name="stereotype" stringValue="C_Cpp::Include"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_RwTdQByJEduN1bTiWJ0lyw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qEMGIrYoEeWaTqnU44XdvA"/>
+      </children>
       <element xmi:type="uml:Class" href="HelloWorld.uml#_tyiqsc__Ed-TP80eVS-2Rg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8LSR4c__Ed-TP80eVS-2Rg" x="80" y="160" width="254" height="109"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8LSR4c__Ed-TP80eVS-2Rg" x="80" y="160" width="261" height="109"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_-HlK8DecEeGPyrZ5I3hMlA" type="2109" fontName="" fontHeight="10" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-HlyADecEeGPyrZ5I3hMlA" source="ShadowFigure">
@@ -156,18 +160,11 @@
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wd890FWUEeKdxoQIVxFNNg" source="ShadowFigure">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wd890VWUEeKdxoQIVxFNNg" key="ShadowFigure_Value" value="false"/>
         </eAnnotations>
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wd890lWUEeKdxoQIVxFNNg" source="displayNameLabelIcon">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wd8901WUEeKdxoQIVxFNNg" key="displayNameLabelIcon_value" value="false"/>
-        </eAnnotations>
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wd891FWUEeKdxoQIVxFNNg" source="QualifiedName">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wd891VWUEeKdxoQIVxFNNg" key="QualifiedNameDepth" value="1000"/>
         </eAnnotations>
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__0Ah0FWUEeKdxoQIVxFNNg" source="Stereotype_Annotation">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jGDUoLkXEeS7TYMQS2xzng" key="StereotypeWithQualifiedNameList" value=""/>
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jGDUobkXEeS7TYMQS2xzng" key="StereotypeList" value="FCM::Port"/>
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jGDUorkXEeS7TYMQS2xzng" key="PropStereoDisplay" value="FCM::Port.kind"/>
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jGDUo7kXEeS7TYMQS2xzng" key="Stereotype_Presentation_Kind" value="IconStereotype"/>
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jGDUpLkXEeS7TYMQS2xzng" key="StereotypePropertyLocation" value="Compartment"/>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ygFe8LYpEeWaTqnU44XdvA" source="displayNameLabelIcon">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ygFe8bYpEeWaTqnU44XdvA" key="displayNameLabelIcon_value" value="true"/>
         </eAnnotations>
         <children xmi:type="notation:DecorationNode" xmi:id="_wd891lWUEeKdxoQIVxFNNg" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_wd9k4FWUEeKdxoQIVxFNNg" x="25" y="3"/>
@@ -175,6 +172,28 @@
         <children xmi:type="notation:DecorationNode" xmi:id="_wd9k4VWUEeKdxoQIVxFNNg" visible="false" type="6029">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_wd9k4lWUEeKdxoQIVxFNNg" x="25" y="-10"/>
         </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_qKT8QLYoEeWaTqnU44XdvA" type="StereotypeBrace">
+          <children xmi:type="notation:DecorationNode" xmi:id="_qKVKZLYoEeWaTqnU44XdvA" visible="false" type="StereotypePropertyBrace">
+            <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_lARBIOLzEd2hC_i8ZB1Yiw"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_qKVKZbYoEeWaTqnU44XdvA"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_qKVKYrYoEeWaTqnU44XdvA" visible="false" type="StereotypePropertyBrace">
+            <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_erj_ECzCEeWf2IvZSSBQwg"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_qKVKY7YoEeWaTqnU44XdvA"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_qKT8QbYoEeWaTqnU44XdvA" showTitle="true"/>
+          <styles xmi:type="notation:StringValueStyle" xmi:id="_qKT8QrYoEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Port"/>
+          <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_pP-ckMtqEd2H_o0jIC6qDQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qKT8Q7YoEeWaTqnU44XdvA"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qHuiULYoEeWaTqnU44XdvA" visible="false" type="StereotypeLabel">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__ERNsLYoEeWaTqnU44XdvA" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__ERNsbYoEeWaTqnU44XdvA" key="visible" value="true"/>
+          </eAnnotations>
+          <styles xmi:type="notation:StringValueStyle" xmi:id="_qHuiUbYoEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Port"/>
+          <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_pP-ckMtqEd2H_o0jIC6qDQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qHuiUrYoEeWaTqnU44XdvA"/>
+        </children>
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_hG-_4LkXEeS7TYMQS2xzng" name="maskLabel">
           <stringListValue>multiplicity</stringListValue>
           <stringListValue>name</stringListValue>
@@ -182,12 +201,64 @@
           <stringListValue>derived</stringListValue>
         </styles>
         <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wd8WwVWUEeKdxoQIVxFNNg" x="-10" y="27"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wd8WwVWUEeKdxoQIVxFNNg" y="32"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_p2fBVLYoEeWaTqnU44XdvA" type="6089">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_p2fBVbYoEeWaTqnU44XdvA" y="5"/>
       </children>
       <element xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rjTBsVWUEeKdxoQIVxFNNg" x="90" y="18" width="253" height="73"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rjTBsVWUEeKdxoQIVxFNNg" x="80" y="18" width="261" height="73"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qEg2QLYoEeWaTqnU44XdvA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qEg2QbYoEeWaTqnU44XdvA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qEg2Q7YoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="HelloWorld.uml#_tyiqsc__Ed-TP80eVS-2Rg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qEg2QrYoEeWaTqnU44XdvA" x="280" y="160"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qHJTgLYoEeWaTqnU44XdvA" type="StereotypeComment">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qHQoQLYoEeWaTqnU44XdvA" type="StereotypeCompartment">
+        <children xmi:type="notation:DecorationNode" xmi:id="_qHQoRLYoEeWaTqnU44XdvA" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_AorBUMtrEd2H_o0jIC6qDQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qHQoRbYoEeWaTqnU44XdvA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qHQoQbYoEeWaTqnU44XdvA" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_qHQoQrYoEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Port"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_pP-ckMtqEd2H_o0jIC6qDQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qHQoQ7YoEeWaTqnU44XdvA"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qHJTgbYoEeWaTqnU44XdvA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qHJTg7YoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qHJTgrYoEeWaTqnU44XdvA" x="200" y="31"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qKVxcLYoEeWaTqnU44XdvA" type="StereotypeComment">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qKXmoLYoEeWaTqnU44XdvA" type="StereotypeCompartment">
+        <children xmi:type="notation:DecorationNode" xmi:id="_qKXmprYoEeWaTqnU44XdvA" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_erj_ECzCEeWf2IvZSSBQwg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qKXmp7YoEeWaTqnU44XdvA"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qKXmqLYoEeWaTqnU44XdvA" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_lARBIOLzEd2hC_i8ZB1Yiw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qKXmqbYoEeWaTqnU44XdvA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qKXmobYoEeWaTqnU44XdvA" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_qKXmorYoEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Port"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_pP-ckMtqEd2H_o0jIC6qDQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qKXmo7YoEeWaTqnU44XdvA"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qKVxcbYoEeWaTqnU44XdvA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qKVxc7YoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qKVxcrYoEeWaTqnU44XdvA" x="190" y="27"/>
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_7kc7Yc__Ed-TP80eVS-2Rg"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_p2fBVrYoEeWaTqnU44XdvA" name="diagram_compatibility_version" stringValue="1.1.0"/>
     <element xmi:type="uml:Package" href="HelloWorld.uml#_LOqIEDLaEd2qeKRLMdIx_A"/>
     <edges xmi:type="notation:Connector" xmi:id="_uHz6kP8nEd-hWJO6cv3VJA" type="4015" source="_8LSR4M__Ed-TP80eVS-2Rg" target="_rjTBsFWUEeKdxoQIVxFNNg" lineColor="0">
       <children xmi:type="notation:DecorationNode" xmi:id="_uH0hoP8nEd-hWJO6cv3VJA" type="6024">
@@ -196,30 +267,70 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_uHz6kf8nEd-hWJO6cv3VJA" fontName="" fontHeight="10"/>
       <element xmi:type="uml:Generalization" href="HelloWorld.uml#_tyiqss__Ed-TP80eVS-2Rg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uHz6kv8nEd-hWJO6cv3VJA" points="[-103, -45, 204, 90]$[-307, -135, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YcZOULkXEeS7TYMQS2xzng" id="(0.515748031496063,0.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YcZOULkXEeS7TYMQS2xzng" id="(0.47244094488188976,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zpY_EFWUEeKdxoQIVxFNNg" id="(0.4782608695652174,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_FOfGwDeeEeGPyrZ5I3hMlA" type="4002" source="_0EFQQDedEeGPyrZ5I3hMlA" target="_rjTBsFWUEeKdxoQIVxFNNg" routing="Rectilinear" lineColor="0">
       <styles xmi:type="notation:FontStyle" xmi:id="_FOfGwTeeEeGPyrZ5I3hMlA" fontName="" fontHeight="10"/>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FOfGwjeeEeGPyrZ5I3hMlA" points="[-6, -3, 83, 0]$[-62, -3, 27, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FOwMgDeeEeGPyrZ5I3hMlA" id="(0.020338983050847456,0.4027777777777778)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FOfGwjeeEeGPyrZ5I3hMlA" points="[420, 60, -643984, -643984]$[343, 60, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FOwMgDeeEeGPyrZ5I3hMlA" id="(0.0,0.3684210526315789)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FOwMgTeeEeGPyrZ5I3hMlA" id="(0.9881422924901185,0.5753424657534246)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_F4Ju0DeeEeGPyrZ5I3hMlA" type="4002" source="_-HlK8DecEeGPyrZ5I3hMlA" target="_8LSR4M__Ed-TP80eVS-2Rg" lineColor="0">
       <styles xmi:type="notation:FontStyle" xmi:id="_F4Ju0TeeEeGPyrZ5I3hMlA" fontName="" fontHeight="10"/>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_F4Ju0jeeEeGPyrZ5I3hMlA" points="[-25, 3, 78, 0]$[-80, -2, 23, -5]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_F4a0kDeeEeGPyrZ5I3hMlA" id="(0.0,0.5125)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_F4a0kDeeEeGPyrZ5I3hMlA" id="(0.0,0.5625)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_F4a0kTeeEeGPyrZ5I3hMlA" id="(0.9448818897637795,0.1834862385321101)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_YapykFT0EeKvFeqt5Q_lqw" type="4002" source="_SypoQFT0EeKvFeqt5Q_lqw" target="_8rDfAFTzEeKvFeqt5Q_lqw" routing="Rectilinear" lineColor="0">
       <styles xmi:type="notation:FontStyle" xmi:id="_YapykVT0EeKvFeqt5Q_lqw" fontName="Sans Serif"/>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YapyklT0EeKvFeqt5Q_lqw" points="[-19, -3, 177, 20]$[-188, -24, 8, -1]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ya7fYFT0EeKvFeqt5Q_lqw" id="(0.0,0.3157894736842105)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YapyklT0EeKvFeqt5Q_lqw" points="[420, 243, -643984, -643984]$[288, 243, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ya7fYFT0EeKvFeqt5Q_lqw" id="(0.0,0.40350877192982454)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ya7fYVT0EeKvFeqt5Q_lqw" id="(1.0,0.65)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_qEhdULYoEeWaTqnU44XdvA" type="StereotypeCommentLink" source="_8LSR4M__Ed-TP80eVS-2Rg" target="_qEg2QLYoEeWaTqnU44XdvA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_qEhdUbYoEeWaTqnU44XdvA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qEiEYLYoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="HelloWorld.uml#_tyiqsc__Ed-TP80eVS-2Rg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qEhdUrYoEeWaTqnU44XdvA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qEhdU7YoEeWaTqnU44XdvA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qEhdVLYoEeWaTqnU44XdvA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_qF26FLYoEeWaTqnU44XdvA" type="StereotypeCommentLink" source="_8rDfAFTzEeKvFeqt5Q_lqw" target="_qF26ELYoEeWaTqnU44XdvA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_qF26FbYoEeWaTqnU44XdvA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qF26GbYoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Property" href="HelloWorld.uml#_8pupUFTzEeKvFeqt5Q_lqw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qF26FrYoEeWaTqnU44XdvA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qF26F7YoEeWaTqnU44XdvA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qF26GLYoEeWaTqnU44XdvA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_qHJThLYoEeWaTqnU44XdvA" type="StereotypeCommentLink" source="_6UeXAFWUEeKdxoQIVxFNNg" target="_qHJTgLYoEeWaTqnU44XdvA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_qHJThbYoEeWaTqnU44XdvA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qHJTibYoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qHJThrYoEeWaTqnU44XdvA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qHJTh7YoEeWaTqnU44XdvA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qHJTiLYoEeWaTqnU44XdvA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_qKVxdLYoEeWaTqnU44XdvA" type="StereotypeCommentLink" source="_wd8WwFWUEeKdxoQIVxFNNg" target="_qKVxcLYoEeWaTqnU44XdvA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_qKVxdbYoEeWaTqnU44XdvA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qKVxebYoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qKVxdrYoEeWaTqnU44XdvA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qKVxd7YoEeWaTqnU44XdvA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qKVxeLYoEeWaTqnU44XdvA"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_o6ZisNCREd-hqYHBJe17_Q" type="CompositeStructure" name="System" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_VSa6YNHtEd-A1oPfP47IaQ" type="2073" fontName="" fontHeight="10" fillColor="8905185" gradient="16777215, 16777215, 0" lineColor="0">
@@ -256,16 +367,118 @@
           <children xmi:type="notation:BasicCompartment" xmi:id="_XsTi59HtEd-A1oPfP47IaQ" type="7077">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XsUJ8NHtEd-A1oPfP47IaQ"/>
           </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_qKx2UrYoEeWaTqnU44XdvA" type="6054">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_qKx2U7YoEeWaTqnU44XdvA" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_qOFB8LYoEeWaTqnU44XdvA" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_qOFB8bYoEeWaTqnU44XdvA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOFB8rYoEeWaTqnU44XdvA"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_Gj0IcLYpEeWaTqnU44XdvA" type="3069">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KLVowLYpEeWaTqnU44XdvA" source="displayNameLabelIcon">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KLVowbYpEeWaTqnU44XdvA" key="displayNameLabelIcon_value" value="false"/>
+            </eAnnotations>
+            <children xmi:type="notation:DecorationNode" xmi:id="_Gj19oLYpEeWaTqnU44XdvA" type="5125">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Gj19obYpEeWaTqnU44XdvA" x="25" y="3"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_Gj19orYpEeWaTqnU44XdvA" type="6029">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Gj19o7YpEeWaTqnU44XdvA" x="25" y="-10"/>
+            </children>
+            <children xmi:type="notation:BasicCompartment" xmi:id="_GkyY0LYpEeWaTqnU44XdvA" type="StereotypeBrace">
+              <children xmi:type="notation:DecorationNode" xmi:id="_Gky_4LYpEeWaTqnU44XdvA" visible="false" type="StereotypePropertyBrace">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Jh8GcLYpEeWaTqnU44XdvA" source="PapyrusCSSForceValue">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Jh8GcbYpEeWaTqnU44XdvA" key="visible" value="true"/>
+                </eAnnotations>
+                <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_AorBUMtrEd2H_o0jIC6qDQ"/>
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_Gky_4bYpEeWaTqnU44XdvA"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_Gky_4rYpEeWaTqnU44XdvA" visible="false" type="StereotypePropertyBrace">
+                <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_erj_ECzCEeWf2IvZSSBQwg"/>
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_Gky_47YpEeWaTqnU44XdvA"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_Gky_5LYpEeWaTqnU44XdvA" visible="false" type="StereotypePropertyBrace">
+                <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_lARBIOLzEd2hC_i8ZB1Yiw"/>
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_Gky_5bYpEeWaTqnU44XdvA"/>
+              </children>
+              <styles xmi:type="notation:TitleStyle" xmi:id="_GkyY0bYpEeWaTqnU44XdvA" showTitle="true"/>
+              <styles xmi:type="notation:StringValueStyle" xmi:id="_GkyY0rYpEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Port"/>
+              <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_pP-ckMtqEd2H_o0jIC6qDQ"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GkyY07YpEeWaTqnU44XdvA"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_GkxxwLYpEeWaTqnU44XdvA" visible="false" type="StereotypeLabel">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_I6RCcLYpEeWaTqnU44XdvA" source="PapyrusCSSForceValue">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_I6RpgLYpEeWaTqnU44XdvA" key="visible" value="true"/>
+              </eAnnotations>
+              <styles xmi:type="notation:StringValueStyle" xmi:id="_GkxxwbYpEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Port"/>
+              <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_pP-ckMtqEd2H_o0jIC6qDQ"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GkxxwrYpEeWaTqnU44XdvA"/>
+            </children>
+            <styles xmi:type="notation:StringListValueStyle" xmi:id="_OThmILYpEeWaTqnU44XdvA" name="maskLabel">
+              <stringListValue>name</stringListValue>
+              <stringListValue>type</stringListValue>
+              <stringListValue>derived</stringListValue>
+            </styles>
+            <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gj0IcbYpEeWaTqnU44XdvA" y="44"/>
+          </children>
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_MLlCMLYpEeWaTqnU44XdvA" name="maskLabel">
+            <stringListValue>name</stringListValue>
+            <stringListValue>type</stringListValue>
+            <stringListValue>derived</stringListValue>
+          </styles>
           <element xmi:type="uml:Property" href="HelloWorld.uml#_gV1cgDLiEd2RVeNawwNNzg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XsS70dHtEd-A1oPfP47IaQ" x="40" y="20" width="193" height="85"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_Gky_5rYpEeWaTqnU44XdvA" type="StereotypeComment">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Gkzm97YpEeWaTqnU44XdvA" type="StereotypeCompartment">
+            <children xmi:type="notation:DecorationNode" xmi:id="_Gkzm_7YpEeWaTqnU44XdvA" visible="false" type="StereotypeProperty">
+              <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_lARBIOLzEd2hC_i8ZB1Yiw"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_GkznALYpEeWaTqnU44XdvA"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_Gkzm_bYpEeWaTqnU44XdvA" visible="false" type="StereotypeProperty">
+              <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_erj_ECzCEeWf2IvZSSBQwg"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Gkzm_rYpEeWaTqnU44XdvA"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_Gkzm-7YpEeWaTqnU44XdvA" visible="false" type="StereotypeProperty">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KtnPYLYpEeWaTqnU44XdvA" source="PapyrusCSSForceValue">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KtnPYbYpEeWaTqnU44XdvA" key="visible" value="true"/>
+              </eAnnotations>
+              <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_AorBUMtrEd2H_o0jIC6qDQ"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Gkzm_LYpEeWaTqnU44XdvA"/>
+            </children>
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Gkzm-LYpEeWaTqnU44XdvA" showTitle="true"/>
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_Gkzm-bYpEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Port"/>
+            <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_pP-ckMtqEd2H_o0jIC6qDQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gkzm-rYpEeWaTqnU44XdvA"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_Gky_57YpEeWaTqnU44XdvA" showTitle="true"/>
+          <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Gkzm8LYpEeWaTqnU44XdvA" name="BASE_ELEMENT">
+            <eObjectValue xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/>
+          </styles>
+          <element xsi:nil="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gky_6LYpEeWaTqnU44XdvA" x="190" y="-9"/>
+        </children>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VScvl9HtEd-A1oPfP47IaQ"/>
       </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qKx2ULYoEeWaTqnU44XdvA" type="6089">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qKx2UbYoEeWaTqnU44XdvA" y="5"/>
+      </children>
       <element xmi:type="uml:Class" href="HelloWorld.uml#_bYJagDLiEd2RVeNawwNNzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VSa6YdHtEd-A1oPfP47IaQ" x="18" y="18" width="280" height="172"/>
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_o6ZisdCREd-hqYHBJe17_Q"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_qKydYLYoEeWaTqnU44XdvA" name="diagram_compatibility_version" stringValue="1.1.0"/>
     <element xmi:type="uml:Package" href="HelloWorld.uml#_LOqIEDLaEd2qeKRLMdIx_A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Gkzm8bYpEeWaTqnU44XdvA" type="StereotypeCommentLink" source="_Gj0IcLYpEeWaTqnU44XdvA" target="_Gky_5rYpEeWaTqnU44XdvA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Gkzm8rYpEeWaTqnU44XdvA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Gkzm9rYpEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Gkzm87YpEeWaTqnU44XdvA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Gkzm9LYpEeWaTqnU44XdvA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Gkzm9bYpEeWaTqnU44XdvA"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_U1UegPcXEd-KM6l7lmIPkw" type="PapyrusUMLClassDiagram" name="deployment" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_FGfloCghEeCw56aD7XrQhw" type="2016" element="_7kc7YM__Ed-TP80eVS-2Rg" fontName="Sans Serif" fontHeight="10" lineColor="0">
@@ -334,6 +547,9 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_ZQkTZ1WjEeKOivupHOJ8Ew"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZQkTaFWjEeKOivupHOJ8Ew"/>
           </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_qOXV0LYoEeWaTqnU44XdvA" type="8509">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_qOXV0bYoEeWaTqnU44XdvA" y="5"/>
+          </children>
           <element xmi:type="uml:InstanceSpecification" href="HelloWorld.uml#_ymErsFT2EeKvFeqt5Q_lqw"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZQjFQVWjEeKOivupHOJ8Ew" x="15" y="13" width="261" height="57"/>
         </children>
@@ -362,6 +578,9 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_Z7UgmlWjEeKOivupHOJ8Ew"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z7Ugm1WjEeKOivupHOJ8Ew"/>
           </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_qOXV0rYoEeWaTqnU44XdvA" type="8509">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_qOXV07YoEeWaTqnU44XdvA" y="5"/>
+          </children>
           <element xmi:type="uml:InstanceSpecification" href="HelloWorld.uml#_ymQR4FT2EeKvFeqt5Q_lqw"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z7T5gVWjEeKOivupHOJ8Ew" x="15" y="133" width="261" height="64"/>
         </children>
@@ -386,6 +605,9 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_85laQlWjEeKOivupHOJ8Ew"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_85laQ1WjEeKOivupHOJ8Ew"/>
           </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_qOX84LYoEeWaTqnU44XdvA" type="8509">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_qOX84bYoEeWaTqnU44XdvA" y="5"/>
+          </children>
           <element xmi:type="uml:InstanceSpecification" href="HelloWorld.uml#_GQ1ekKwHEeCQX8uv_p0Q4A"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_85kMIVWjEeKOivupHOJ8Ew" x="375" y="13" width="163" height="46"/>
         </children>
@@ -401,14 +623,14 @@
           </eAnnotations>
           <children xmi:type="notation:DecorationNode" xmi:id="_wCYjc1ZVEeKKZs15rvNNjA" type="5063"/>
           <element xmi:type="uml:Comment" href="HelloWorld.uml#_wAbboFZVEeKKZs15rvNNjA"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wCUSAVZVEeKKZs15rvNNjA" x="325" y="97" width="208" height="83"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wCUSAVZVEeKKZs15rvNNjA" x="325" y="97" width="235" height="83"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_-4lixFWREeKdxoQIVxFNNg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-4lixVWREeKdxoQIVxFNNg"/>
       </children>
       <styles xmi:type="notation:IntValueStyle" xmi:id="_u3oFQLkXEeS7TYMQS2xzng" name="shapeDirection" intValue="1"/>
       <element xmi:type="uml:Package" href="HelloWorld.uml#_yl9-AFT2EeKvFeqt5Q_lqw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-4h4YVWREeKdxoQIVxFNNg" x="20" y="200" width="571" height="254"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-4h4YVWREeKdxoQIVxFNNg" x="20" y="200" width="597" height="254"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_obNuEFWiEeKOivupHOJ8Ew" type="2012" fontName="Sans Serif" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_obQxYFWiEeKOivupHOJ8Ew" source="ShadowFigure">
@@ -424,11 +646,28 @@
       <element xmi:type="uml:Comment" href="HelloWorld.uml#_oZw8kFWiEeKOivupHOJ8Ew"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_obNuEVWiEeKOivupHOJ8Ew" x="315" y="90" width="226" height="55"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_qX0z0LYoEeWaTqnU44XdvA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qX0z0bYoEeWaTqnU44XdvA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qX0z07YoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Package" href="HelloWorld.uml#_yl9-AFT2EeKvFeqt5Q_lqw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qX0z0rYoEeWaTqnU44XdvA" x="220" y="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qYPDgLYoEeWaTqnU44XdvA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qYPDgbYoEeWaTqnU44XdvA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qYPDg7YoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="HelloWorld.uml#_UPx34FWUEeKdxoQIVxFNNg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qYPDgrYoEeWaTqnU44XdvA" x="215" y="-87"/>
+    </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_U1UegfcXEd-KM6l7lmIPkw"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_qOX84rYoEeWaTqnU44XdvA" name="diagram_compatibility_version" stringValue="1.1.0"/>
     <element xmi:type="uml:Package" href="HelloWorld.uml#_234GEDLiEd2RVeNawwNNzg"/>
     <edges xmi:type="notation:Connector" xmi:id="_86CtQFWjEeKOivupHOJ8Ew" type="4006" source="_ZQjFQFWjEeKOivupHOJ8Ew" target="_85kMIFWjEeKOivupHOJ8Ew" lineColor="0">
-      <children xmi:type="notation:DecorationNode" xmi:id="_86D7YFWjEeKOivupHOJ8Ew" type="6014">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_86D7YVWjEeKOivupHOJ8Ew" y="40"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_86D7YFWjEeKOivupHOJ8Ew" visible="false" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_86D7YVWjEeKOivupHOJ8Ew" x="9" y="45"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_86D7YlWjEeKOivupHOJ8Ew" type="6015">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_86D7Y1WjEeKOivupHOJ8Ew" x="-4" y="-9"/>
@@ -449,16 +688,36 @@
     <edges xmi:type="notation:Connector" xmi:id="_7O5fMFZVEeKKZs15rvNNjA" type="4013" source="_wCUSAFZVEeKKZs15rvNNjA" target="_ZQjFQFWjEeKOivupHOJ8Ew" routing="Rectilinear" lineColor="0">
       <styles xmi:type="notation:FontStyle" xmi:id="_7O5fMVZVEeKKZs15rvNNjA" fontName="Sans Serif"/>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7O5fMlZVEeKKZs15rvNNjA" points="[0, -15, 147, 39]$[-110, -15, 37, 39]$[-110, -54, 37, 0]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7O5fMlZVEeKKZs15rvNNjA" points="[350, 356, -643984, -643984]$[236, 356, -643984, -643984]$[236, 315, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7PO2YFZVEeKKZs15rvNNjA" id="(0.0,0.11965811965811966)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yzWT8LkXEeS7TYMQS2xzng" id="(0.7662835249042146,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yzWT8LkXEeS7TYMQS2xzng" id="(0.7509578544061303,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_71Q7oFZVEeKKZs15rvNNjA" type="4013" source="_wCUSAFZVEeKKZs15rvNNjA" target="_Z7T5gFWjEeKOivupHOJ8Ew" routing="Rectilinear" lineColor="0">
       <styles xmi:type="notation:FontStyle" xmi:id="_71Q7oVZVEeKKZs15rvNNjA" fontName="Sans Serif"/>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_71Q7olZVEeKKZs15rvNNjA" points="[-12, 8, 82, 0]$[-73, 9, 21, 1]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_71Q7olZVEeKKZs15rvNNjA" points="[350, 407, -643984, -643984]$[301, 407, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_71iBYFZVEeKKZs15rvNNjA" id="(0.0,0.6410256410256411)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_71iBYVZVEeKKZs15rvNNjA" id="(1.0,0.609375)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_71iBYVZVEeKKZs15rvNNjA" id="(1.0,0.453125)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_qX0z1LYoEeWaTqnU44XdvA" type="StereotypeCommentLink" source="_-4h4YFWREeKdxoQIVxFNNg" target="_qX0z0LYoEeWaTqnU44XdvA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_qX0z1bYoEeWaTqnU44XdvA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qX0z2bYoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Package" href="HelloWorld.uml#_yl9-AFT2EeKvFeqt5Q_lqw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qX0z1rYoEeWaTqnU44XdvA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qX0z17YoEeWaTqnU44XdvA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qX0z2LYoEeWaTqnU44XdvA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_qYPDhLYoEeWaTqnU44XdvA" type="StereotypeCommentLink" source="_86CtQFWjEeKOivupHOJ8Ew" target="_qYPDgLYoEeWaTqnU44XdvA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_qYPDhbYoEeWaTqnU44XdvA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qYPDibYoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="HelloWorld.uml#_UPx34FWUEeKdxoQIVxFNNg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qYPDhrYoEeWaTqnU44XdvA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qYPDh7YoEeWaTqnU44XdvA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qYPDiLYoEeWaTqnU44XdvA"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_0rwpYDefEeGPyrZ5I3hMlA" type="CompositeStructure" name="HWArchitecture" measurementUnit="Pixel">
@@ -472,13 +731,6 @@
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1w2pNDefEeGPyrZ5I3hMlA" source="QualifiedName">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1w2pNTefEeGPyrZ5I3hMlA" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HTZS4DegEeGPyrZ5I3hMlA" source="Stereotype_Annotation">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAM_QBMqEeK_iPOWsxJHwg" key="StereotypeWithQualifiedNameList" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAM_QRMqEeK_iPOWsxJHwg" key="StereotypeList" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mANmUBMqEeK_iPOWsxJHwg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mANmURMqEeK_iPOWsxJHwg" key="PropStereoDisplay" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mANmUhMqEeK_iPOWsxJHwg" key="StereotypePropertyLocation" value="Compartment"/>
-      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_1w2pNjefEeGPyrZ5I3hMlA" type="5156"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_1w2pNzefEeGPyrZ5I3hMlA" type="7073">
         <children xmi:type="notation:Shape" xmi:id="_4HLnYDefEeGPyrZ5I3hMlA" type="3070" fontName="" fontHeight="10" lineColor="0">
@@ -504,17 +756,23 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_4HMOeDefEeGPyrZ5I3hMlA" showTitle="true"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4HMOeTefEeGPyrZ5I3hMlA"/>
           </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_qZEJ8rYoEeWaTqnU44XdvA" type="6054">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_qZEJ87YoEeWaTqnU44XdvA" y="5"/>
+          </children>
           <styles xmi:type="notation:StringListValueStyle" xmi:id="_DrFGELkYEeS7TYMQS2xzng" name="maskLabel">
             <stringListValue>name</stringListValue>
             <stringListValue>type</stringListValue>
             <stringListValue>derived</stringListValue>
           </styles>
           <element xmi:type="uml:Property" href="HelloWorld.uml#_4HAoQDefEeGPyrZ5I3hMlA"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4HLnYTefEeGPyrZ5I3hMlA" x="49" y="22" width="190"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4HLnYTefEeGPyrZ5I3hMlA" x="40" y="19" width="217" height="82"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_1w2pODefEeGPyrZ5I3hMlA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1w2pOTefEeGPyrZ5I3hMlA"/>
       </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qZEJ8LYoEeWaTqnU44XdvA" type="6089">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qZEJ8bYoEeWaTqnU44XdvA" y="5"/>
+      </children>
       <element xmi:type="uml:Class" href="HelloWorld.uml#_tZvNQDefEeGPyrZ5I3hMlA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1w2CITefEeGPyrZ5I3hMlA" x="80" y="63" width="301" height="154"/>
     </children>
@@ -528,20 +786,59 @@
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7qNCNDefEeGPyrZ5I3hMlA" source="QualifiedName">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7qNCNTefEeGPyrZ5I3hMlA" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_85ECADefEeGPyrZ5I3hMlA" source="Stereotype_Annotation">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B_VokFWjEeKOivupHOJ8Ew" key="StereotypeWithQualifiedNameList" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B_WPoFWjEeKOivupHOJ8Ew" key="StereotypeList" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B_WPoVWjEeKOivupHOJ8Ew" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B_WPolWjEeKOivupHOJ8Ew" key="PropStereoDisplay" value="FCM::Target.targetArch,FCM::Target.usedOS"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B_WPo1WjEeKOivupHOJ8Ew" key="StereotypePropertyLocation" value="Compartment"/>
-      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_7qNCNjefEeGPyrZ5I3hMlA" type="5124"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_7qNCNzefEeGPyrZ5I3hMlA" visible="false" type="7072">
         <styles xmi:type="notation:TitleStyle" xmi:id="_7qNCODefEeGPyrZ5I3hMlA" showTitle="true"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qNCOTefEeGPyrZ5I3hMlA"/>
       </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qZEJ9LYoEeWaTqnU44XdvA" type="6088">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qZEJ9bYoEeWaTqnU44XdvA" y="5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qcreoLYoEeWaTqnU44XdvA" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_qcreobYoEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Target"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_0KEH0JOCEd-5qPBhYeIVtw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcreorYoEeWaTqnU44XdvA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qc_nsLYoEeWaTqnU44XdvA" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qdMcALYoEeWaTqnU44XdvA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qdMcAbYoEeWaTqnU44XdvA" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qdA10LYoEeWaTqnU44XdvA" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#__5rAUGE_Ed-eArNXja7SuA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qdA10bYoEeWaTqnU44XdvA"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qdBc4rYoEeWaTqnU44XdvA" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_BZCjMJOGEd-5qPBhYeIVtw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qdBc47YoEeWaTqnU44XdvA"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qdBc4LYoEeWaTqnU44XdvA" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_C5WBYGGLEd-yH9S4VNNbSQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qdBc4bYoEeWaTqnU44XdvA"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qdCD8rYoEeWaTqnU44XdvA" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_8g_IsNTGEeKiLbHSN_MIRQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qdCD87YoEeWaTqnU44XdvA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qc_nsbYoEeWaTqnU44XdvA" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_qc_nsrYoEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Target"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_0KEH0JOCEd-5qPBhYeIVtw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qc_ns7YoEeWaTqnU44XdvA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qc4S8LYoEeWaTqnU44XdvA" type="StereotypeBrace">
+        <children xmi:type="notation:DecorationNode" xmi:id="_qc5hErYoEeWaTqnU44XdvA" visible="false" type="StereotypePropertyBrace">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fqNlILYpEeWaTqnU44XdvA" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fqNlIbYpEeWaTqnU44XdvA" key="visible" value="true"/>
+          </eAnnotations>
+          <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_C5WBYGGLEd-yH9S4VNNbSQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qc5hE7YoEeWaTqnU44XdvA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qc4S8bYoEeWaTqnU44XdvA" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_qc4S8rYoEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Target"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_0KEH0JOCEd-5qPBhYeIVtw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qc4S87YoEeWaTqnU44XdvA"/>
+      </children>
       <element xmi:type="uml:Node" href="HelloWorld.uml#_zY9vMDLiEd2RVeNawwNNzg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qMbITefEeGPyrZ5I3hMlA" x="440" y="63" width="181" height="91"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qMbITefEeGPyrZ5I3hMlA" x="440" y="63" width="238" height="107"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_jhQ20DegEeGPyrZ5I3hMlA" type="2109" fontName="" fontHeight="10" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jhQ20jegEeGPyrZ5I3hMlA" source="ShadowFigure">
@@ -555,20 +852,117 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_jhRd4DegEeGPyrZ5I3hMlA" type="5192"/>
       <element xmi:type="uml:Comment" href="HelloWorld.uml#_jhF3sDegEeGPyrZ5I3hMlA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhQ20TegEeGPyrZ5I3hMlA" x="435" y="183" width="277"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhQ20TegEeGPyrZ5I3hMlA" x="431" y="217" width="277"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qc79ULYoEeWaTqnU44XdvA" type="StereotypeComment">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qc9LcLYoEeWaTqnU44XdvA" type="StereotypeCompartment">
+        <children xmi:type="notation:DecorationNode" xmi:id="_qc9ygrYoEeWaTqnU44XdvA" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://FCM_PROFILES/FCM.profile.uml#_C5WBYGGLEd-yH9S4VNNbSQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qc9yg7YoEeWaTqnU44XdvA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qc9LcbYoEeWaTqnU44XdvA" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_qc9LcrYoEeWaTqnU44XdvA" name="stereotype" stringValue="FCM::Target"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://FCM_PROFILES/FCM.profile.uml#_0KEH0JOCEd-5qPBhYeIVtw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qc9Lc7YoEeWaTqnU44XdvA"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qc79UbYoEeWaTqnU44XdvA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qc79U7YoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Node" href="HelloWorld.uml#_zY9vMDLiEd2RVeNawwNNzg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qc79UrYoEeWaTqnU44XdvA" x="640" y="63"/>
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_0rwpYTefEeGPyrZ5I3hMlA"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_qZEJ9rYoEeWaTqnU44XdvA" name="diagram_compatibility_version" stringValue="1.1.0"/>
     <element xmi:type="uml:Package" href="HelloWorld.uml#_v3fMgDLiEd2RVeNawwNNzg"/>
     <edges xmi:type="notation:Connector" xmi:id="_ugb6IDegEeGPyrZ5I3hMlA" type="4002" source="_jhQ20DegEeGPyrZ5I3hMlA" target="_7qMbIDefEeGPyrZ5I3hMlA" routing="Rectilinear" lineColor="0">
       <styles xmi:type="notation:FontStyle" xmi:id="_ugb6ITegEeGPyrZ5I3hMlA" fontName="" fontHeight="10"/>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ugb6IjegEeGPyrZ5I3hMlA" points="[-3, -6, 22, 58]$[-30, -51, -5, 13]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ugs_4DegEeGPyrZ5I3hMlA" id="(0.2815884476534296,0.05)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ugs_4TegEeGPyrZ5I3hMlA" id="(0.4420289855072464,0.8266666666666667)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ugb6IjegEeGPyrZ5I3hMlA" points="[540, 217, -643984, -643984]$[540, 193, -643984, -643984]$[541, 193, -643984, -643984]$[541, 170, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ugs_4DegEeGPyrZ5I3hMlA" id="(0.3971119133574007,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ugs_4TegEeGPyrZ5I3hMlA" id="(0.42436974789915966,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_qc79VLYoEeWaTqnU44XdvA" type="StereotypeCommentLink" source="_7qMbIDefEeGPyrZ5I3hMlA" target="_qc79ULYoEeWaTqnU44XdvA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_qc79VbYoEeWaTqnU44XdvA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qc79WbYoEeWaTqnU44XdvA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Node" href="HelloWorld.uml#_zY9vMDLiEd2RVeNawwNNzg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qc79VrYoEeWaTqnU44XdvA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qc79V7YoEeWaTqnU44XdvA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qc79WLYoEeWaTqnU44XdvA"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_ovKvYFWjEeKOivupHOJ8Ew" type="PapyrusUMLDeploymentDiagram" name="NewDeploymentDiagram" measurementUnit="Pixel">
     <styles xmi:type="notation:DiagramStyle" xmi:id="_ovKvYVWjEeKOivupHOJ8Ew"/>
     <element xmi:type="uml:Package" href="HelloWorld.uml#_234GEDLiEd2RVeNawwNNzg"/>
   </notation:Diagram>
+  <notation:Diagram xmi:id="_kIfpMLfoEeWaTqnU44XdvA" type="PapyrusUMLClassDiagram" name="HelloWorld class" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_p03KgLi2EeWDsejo3zDcqw" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_p04YoLi2EeWDsejo3zDcqw" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_p04Yobi2EeWDsejo3zDcqw" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_p04Yori2EeWDsejo3zDcqw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_p04_sLi2EeWDsejo3zDcqw" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_p04_sbi2EeWDsejo3zDcqw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_p04_sri2EeWDsejo3zDcqw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_p04_s7i2EeWDsejo3zDcqw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p04_tLi2EeWDsejo3zDcqw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_p04_tbi2EeWDsejo3zDcqw" type="7018">
+        <children xmi:type="notation:Shape" xmi:id="_rqq1kLi2EeWDsejo3zDcqw" type="3013">
+          <element xmi:type="uml:Operation" href="HelloWorld.uml#_UtCt0FTzEeKvFeqt5Q_lqw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rqrcoLi2EeWDsejo3zDcqw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_p04_tri2EeWDsejo3zDcqw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_p04_t7i2EeWDsejo3zDcqw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_p04_uLi2EeWDsejo3zDcqw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p04_ubi2EeWDsejo3zDcqw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_p04_uri2EeWDsejo3zDcqw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_p04_u7i2EeWDsejo3zDcqw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_p04_vLi2EeWDsejo3zDcqw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_p04_vbi2EeWDsejo3zDcqw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p04_vri2EeWDsejo3zDcqw"/>
+      </children>
+      <element xmi:type="uml:Class" href="HelloWorld.uml#_tyiqsc__Ed-TP80eVS-2Rg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p03Kgbi2EeWDsejo3zDcqw" x="92" y="99" width="205"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_p1HpMLi2EeWDsejo3zDcqw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_p1HpMbi2EeWDsejo3zDcqw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_p1IQQLi2EeWDsejo3zDcqw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="HelloWorld.uml#_tyiqsc__Ed-TP80eVS-2Rg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p1HpMri2EeWDsejo3zDcqw" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_yB3BILi2EeWDsejo3zDcqw" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_yB3BIri2EeWDsejo3zDcqw" type="5038"/>
+      <element xmi:type="uml:Comment" href="HelloWorld.uml#_2OyuALcpEeWaTqnU44XdvA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yB3BIbi2EeWDsejo3zDcqw" x="398" y="124" width="637"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_kIfpMbfoEeWaTqnU44XdvA" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_kIfpMrfoEeWaTqnU44XdvA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_kIfpM7foEeWaTqnU44XdvA">
+      <owner xmi:type="uml:Package" href="HelloWorld.uml#_LOqIEDLaEd2qeKRLMdIx_A"/>
+    </styles>
+    <element xmi:type="uml:Package" href="HelloWorld.uml#_LOqIEDLaEd2qeKRLMdIx_A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_p1IQQbi2EeWDsejo3zDcqw" type="StereotypeCommentLink" source="_p03KgLi2EeWDsejo3zDcqw" target="_p1HpMLi2EeWDsejo3zDcqw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_p1IQQri2EeWDsejo3zDcqw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_p1I3Ubi2EeWDsejo3zDcqw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="HelloWorld.uml#_tyiqsc__Ed-TP80eVS-2Rg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_p1IQQ7i2EeWDsejo3zDcqw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_p1IQRLi2EeWDsejo3zDcqw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_p1I3ULi2EeWDsejo3zDcqw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_2DiG0Li2EeWDsejo3zDcqw" type="4013" source="_yB3BILi2EeWDsejo3zDcqw" target="_p03KgLi2EeWDsejo3zDcqw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2DiG0bi2EeWDsejo3zDcqw"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2DiG0ri2EeWDsejo3zDcqw" points="[398, 154, -643984, -643984]$[297, 170, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2DuUELi2EeWDsejo3zDcqw" id="(0.0,0.8166666666666667)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2DuUEbi2EeWDsejo3zDcqw" id="(1.0,0.6826923076923077)"/>
+    </edges>
+  </notation:Diagram>
 </xmi:XMI>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.uml
index 3d3e0752b5c..d46ef6abf65 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorld.uml
@@ -23,6 +23,9 @@
         <ownedComment xmi:type="uml:Comment" xmi:id="_SxvpUFT0EeKvFeqt5Q_lqw" annotatedElement="_8pupUFTzEeKvFeqt5Q_lqw">
           <body>Configuration attribute within the Hello World component. Its value is configured on the instance level.</body>
         </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_2OyuALcpEeWaTqnU44XdvA" annotatedElement="_UtCt0FTzEeKvFeqt5Q_lqw">
+          <body>The operation &quot;run&quot; is defined in interface IRunnnable that is provided by the IStart port. The synchronisation mechanism in Qompass (&quot;Sync. derived element&quot;, needs to be triggered by user) adds a corresponding &quot;derived&quot; operation to the class </body>
+        </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_tyiqss__Ed-TP80eVS-2Rg">
           <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/>
         </generalization>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.di
index c651eaf4315..c651eaf4315 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.notation
index d8404d0904b..d8404d0904b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.uml
index a02dc7a2a5f..a02dc7a2a5f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldC.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.di
index 670de7fb972..670de7fb972 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.notation
index 83d0bb6c94c..83d0bb6c94c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.uml
index f0ce2f36f68..f0ce2f36f68 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/HelloWorldJava.uml
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.notation
index cbbd906bbaf..cbbd906bbaf 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.uml
index 6f14b85b526..6f14b85b526 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerConsumer.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.di
index 17cff76e5d5..17cff76e5d5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.notation
index 6e4bd7a2591..6e4bd7a2591 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.uml
index 4690ec8712c..4690ec8712c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ProducerTwoConsumers.uml
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-CDTeditor.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-CDTeditor.png
new file mode 100644
index 00000000000..fc3d356a890
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-CDTeditor.png
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-OpenCDTeditor.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-OpenCDTeditor.png
new file mode 100644
index 00000000000..2d035823791
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-OpenCDTeditor.png
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-classdiag.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-classdiag.png
new file mode 100644
index 00000000000..243f412cdf9
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-classdiag.png
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-component.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-component.png
new file mode 100644
index 00000000000..88c03612ba9
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-component.png
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-component.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-component.svg
new file mode 100644
index 00000000000..0170b7235ea
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-component.svg
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-dasharray="none" shape-rendering="auto" font-family="'Dialog'" width="671" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-interpolation="auto" color-rendering="auto" preserveAspectRatio="xMidYMid meet" font-size="12" viewBox="0 0 671 279" fill="black" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="279" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">
+<!--Generated by the Batik Graphics2D SVG Generator-->
+<defs id="genericDefs"/>
+<g>
+<defs id="defs1">
+<linearGradient x1="20" x2="20" y1="152" gradientUnits="userSpaceOnUse" y2="261" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient1" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(225,225,135)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="10" x2="10" y1="173" gradientUnits="userSpaceOnUse" y2="193" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient2" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="360" x2="360" y1="127" gradientUnits="userSpaceOnUse" y2="207" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient3" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="360" x2="360" y1="10" gradientUnits="userSpaceOnUse" y2="124" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient4" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="360" x2="360" y1="212" gradientUnits="userSpaceOnUse" y2="269" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient5" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="20" x2="20" y1="10" gradientUnits="userSpaceOnUse" y2="83" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient6" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,215,221)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="10" x2="10" y1="27" gradientUnits="userSpaceOnUse" y2="47" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient7" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">
+<path d="M20 152 L20 260 L280 260 L280 152 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">
+<path d="M112 154 L188 154 L188 173 L112 173 L112 154 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
+<path d="M64 208 L229 208 L229 250 L64 250 L64 208 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
+<path d="M71 213 L224 213 L224 230 L71 230 L71 213 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
+<path d="M75 229 L219 229 L219 246 L75 246 L75 229 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
+<path d="M19 172 L282 172 L282 262 L19 262 L19 172 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath7">
+<path d="M19 151 L282 151 L282 262 L19 262 L19 151 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath8">
+<path d="M10 173 L10 192 L29 192 L29 173 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath9">
+<path d="M9 172 L31 172 L31 194 L9 194 L9 172 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath10">
+<path d="M34 175 L138 175 L138 192 L34 192 L34 175 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath11">
+<path d="M360 127 L360 206 L660 206 L660 139 L648 127 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath12">
+<path d="M365 132 L640 132 L640 202 L365 202 L365 132 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath13">
+<path d="M359 126 L662 126 L662 208 L359 208 L359 126 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath14">
+<path d="M360 10 L360 123 L660 123 L660 22 L648 10 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath15">
+<path d="M365 15 L644 15 L644 119 L365 119 L365 15 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath16">
+<path d="M359 9 L662 9 L662 125 L359 125 L359 9 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath17">
+<path d="M360 212 L360 268 L660 268 L660 224 L648 212 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath18">
+<path d="M365 217 L641 217 L641 264 L365 264 L365 217 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath19">
+<path d="M359 211 L662 211 L662 270 L359 270 L359 211 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath20">
+<path d="M20 10 L20 82 L280 82 L280 10 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath21">
+<path d="M126 12 L175 12 L175 29 L126 29 L126 12 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath22">
+<path d="M19 28 L282 28 L282 84 L19 84 L19 28 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath23">
+<path d="M19 9 L282 9 L282 84 L19 84 L19 9 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath24">
+<path d="M10 27 L10 46 L29 46 L29 27 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath25">
+<path d="M9 26 L31 26 L31 48 L9 48 L9 26 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath26">
+<path d="M34 29 L138 29 L138 46 L34 46 L34 29 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath27">
+<path d="M-1 -1 L672 -1 L672 280 L-1 280 L-1 -1 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath28">
+<path d="M131 82 L150 82 L150 95 L131 95 L131 82 Z"/>
+</clipPath>
+</defs>
+<g fill="url(#linearGradient1)" stroke-miterlimit="0" stroke-width="0" stroke="url(#linearGradient1)" stroke-linejoin="round">
+<rect x="20" y="152" clip-path="url(#clipPath1)" width="261" height="109" stroke="none"/>
+<text x="113" font-size="13" y="168" clip-path="url(#clipPath2)" fill="black" stroke="none" xml:space="preserve">HelloWorld  </text>
+<rect x="65" y="209" clip-path="url(#clipPath3)" fill="white" width="163" rx="0" ry="0" height="40" stroke="none"/>
+<text x="72" y="226" clip-path="url(#clipPath4)" fill="black" stroke="none" xml:space="preserve">«ConfigurationProperty»</text>
+<text x="76" y="242" clip-path="url(#clipPath5)" fill="black" stroke="none" xml:space="preserve"> + message: String [1]</text>
+</g>
+<g stroke-linecap="butt" stroke-width="1.1">
+<rect x="65" y="209" clip-path="url(#clipPath3)" fill="none" width="162" rx="0" ry="0" height="39"/>
+<line clip-path="url(#clipPath6)" fill="none" x1="20" x2="281" y1="173" y2="173"/>
+<rect x="20" y="152" clip-path="url(#clipPath7)" fill="none" width="260" rx="0" ry="0" height="108"/>
+<rect x="10" y="173" clip-path="url(#clipPath8)" fill="url(#linearGradient2)" width="20" height="20" stroke="none"/>
+<rect x="10" y="173" clip-path="url(#clipPath9)" fill="none" width="19" rx="0" ry="0" height="19"/>
+<text xml:space="preserve" x="35" y="188" clip-path="url(#clipPath10)" stroke="none">  start: IStart [1]</text>
+<rect x="360" y="127" clip-path="url(#clipPath11)" fill="url(#linearGradient3)" width="301" height="80" stroke="none"/>
+<text x="366" font-size="13" y="146" clip-path="url(#clipPath12)" stroke="none" xml:space="preserve">Simple HelloWorld component that prints a</text>
+<text x="366" font-size="13" y="163" clip-path="url(#clipPath12)" stroke="none" xml:space="preserve">message in its "run" operation that is</text>
+<text x="366" font-size="13" y="180" clip-path="url(#clipPath12)" stroke="none" xml:space="preserve">provided via the "start" port</text>
+<line clip-path="url(#clipPath13)" fill="none" x1="360" x2="648" y1="127" y2="127"/>
+<line clip-path="url(#clipPath13)" fill="none" x1="648" x2="660" y1="127" y2="139"/>
+<line clip-path="url(#clipPath13)" fill="none" x1="660" x2="660" y1="139" y2="206"/>
+<line clip-path="url(#clipPath13)" fill="none" x1="660" x2="360" y1="206" y2="206"/>
+<line clip-path="url(#clipPath13)" fill="none" x1="360" x2="360" y1="206" y2="127"/>
+<line clip-path="url(#clipPath13)" fill="none" x1="360" x2="360" y1="127" y2="127"/>
+<line clip-path="url(#clipPath13)" fill="none" x1="648" x2="648" y1="127" y2="139"/>
+<line clip-path="url(#clipPath13)" fill="none" x1="648" x2="661" y1="139" y2="139"/>
+<rect x="360" y="10" clip-path="url(#clipPath14)" fill="url(#linearGradient4)" width="301" height="114" stroke="none"/>
+<text x="366" font-size="13" y="29" clip-path="url(#clipPath15)" stroke="none" xml:space="preserve">Part of the Qompass core model library.</text>
+<text x="366" font-size="13" y="46" clip-path="url(#clipPath15)" stroke="none" xml:space="preserve">Provides the specific port "start". The "run"</text>
+<text x="366" font-size="13" y="63" clip-path="url(#clipPath15)" stroke="none" xml:space="preserve">operation (defined within interface IStart) of</text>
+<text x="366" font-size="13" y="80" clip-path="url(#clipPath15)" stroke="none" xml:space="preserve">this port is called by generated boot-code</text>
+<text x="366" font-size="13" y="97" clip-path="url(#clipPath15)" stroke="none" xml:space="preserve">after instantiation and configuration of a</text>
+<text x="366" font-size="13" y="114" clip-path="url(#clipPath15)" stroke="none" xml:space="preserve">component. </text>
+<line clip-path="url(#clipPath16)" fill="none" x1="360" x2="648" y1="10" y2="10"/>
+<line clip-path="url(#clipPath16)" fill="none" x1="648" x2="660" y1="10" y2="22"/>
+<line clip-path="url(#clipPath16)" fill="none" x1="660" x2="660" y1="22" y2="123"/>
+<line clip-path="url(#clipPath16)" fill="none" x1="660" x2="360" y1="123" y2="123"/>
+<line clip-path="url(#clipPath16)" fill="none" x1="360" x2="360" y1="123" y2="10"/>
+<line clip-path="url(#clipPath16)" fill="none" x1="360" x2="360" y1="10" y2="10"/>
+<line clip-path="url(#clipPath16)" fill="none" x1="648" x2="648" y1="10" y2="22"/>
+<line clip-path="url(#clipPath16)" fill="none" x1="648" x2="661" y1="22" y2="22"/>
+<rect x="360" y="212" clip-path="url(#clipPath17)" fill="url(#linearGradient5)" width="301" height="57" stroke="none"/>
+<text xml:space="preserve" x="366" y="230" clip-path="url(#clipPath18)" stroke="none">Configuration attribute within the Hello</text>
+<text xml:space="preserve" x="366" y="245" clip-path="url(#clipPath18)" stroke="none">World component. Its value is configured on</text>
+<text xml:space="preserve" x="366" y="260" clip-path="url(#clipPath18)" stroke="none">the instance level.</text>
+<line clip-path="url(#clipPath19)" fill="none" x1="360" x2="648" y1="212" y2="212"/>
+<line clip-path="url(#clipPath19)" fill="none" x1="648" x2="660" y1="212" y2="224"/>
+<line clip-path="url(#clipPath19)" fill="none" x1="660" x2="660" y1="224" y2="268"/>
+<line clip-path="url(#clipPath19)" fill="none" x1="660" x2="360" y1="268" y2="268"/>
+<line clip-path="url(#clipPath19)" fill="none" x1="360" x2="360" y1="268" y2="212"/>
+<line clip-path="url(#clipPath19)" fill="none" x1="360" x2="360" y1="212" y2="212"/>
+<line clip-path="url(#clipPath19)" fill="none" x1="648" x2="648" y1="212" y2="224"/>
+<line clip-path="url(#clipPath19)" fill="none" x1="648" x2="661" y1="224" y2="224"/>
+<rect x="20" y="10" clip-path="url(#clipPath20)" fill="url(#linearGradient6)" width="261" height="73" stroke="none"/>
+<text x="127" y="25" clip-path="url(#clipPath21)" font-style="italic" stroke="none" xml:space="preserve">Cstart  </text>
+<line clip-path="url(#clipPath22)" fill="none" x1="20" x2="281" y1="29" y2="29"/>
+<rect x="20" y="10" clip-path="url(#clipPath23)" fill="none" width="260" rx="0" ry="0" height="72"/>
+<rect x="10" y="27" clip-path="url(#clipPath24)" fill="url(#linearGradient7)" width="20" height="20" stroke="none"/>
+<rect x="10" y="27" clip-path="url(#clipPath25)" fill="none" width="19" rx="0" ry="0" height="19"/>
+<text xml:space="preserve" x="35" y="42" clip-path="url(#clipPath26)" stroke="none">  start: IStart [1]</text>
+<line clip-path="url(#clipPath27)" fill="none" text-rendering="optimizeLegibility" x1="140" x2="140" y1="152" y2="83"/>
+</g>
+<g stroke-linecap="butt" font-size="13" fill="white" text-rendering="optimizeLegibility" stroke="white" stroke-width="1.1">
+<polygon clip-path="url(#clipPath28)" points=" 140 83 148 93 132 93" stroke="none"/>
+<polygon fill="none" clip-path="url(#clipPath28)" points=" 140 83 148 93 132 93" stroke="black"/>
+<line clip-path="url(#clipPath27)" fill="none" x1="360" x2="281" y1="52" y2="52" stroke-dasharray="6.6,3.3" stroke="black"/>
+<line clip-path="url(#clipPath27)" fill="none" x1="360" x2="281" y1="172" y2="172" stroke-dasharray="6.6,3.3" stroke="black"/>
+</g>
+<g text-rendering="optimizeLegibility" stroke-width="1.1" stroke-dasharray="6.6,3.3" stroke-linecap="butt">
+<line clip-path="url(#clipPath27)" fill="none" x1="360" x2="294" y1="232" y2="232"/>
+<line clip-path="url(#clipPath27)" fill="none" x1="294" x2="228" y1="232" y2="232"/>
+</g>
+</g>
+</svg>
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-deployment.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-deployment.png
new file mode 100644
index 00000000000..a53b6fdf43d
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-deployment.png
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-deployment.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-deployment.svg
new file mode 100644
index 00000000000..e69c7837eee
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-deployment.svg
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-dasharray="none" shape-rendering="auto" font-family="'Dialog'" width="650" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-interpolation="auto" color-rendering="auto" preserveAspectRatio="xMidYMid meet" font-size="12" viewBox="0 0 650 487" fill="black" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="487" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">
+<!--Generated by the Batik Graphics2D SVG Generator-->
+<defs id="genericDefs"/>
+<g>
+<defs id="defs1">
+<linearGradient x1="77" x2="77" y1="47" gradientUnits="userSpaceOnUse" y2="67" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient1" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="338" x2="338" y1="41" gradientUnits="userSpaceOnUse" y2="83" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient2" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="43" x2="43" y1="223" gradientUnits="userSpaceOnUse" y2="477" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient3" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(225,225,135)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="373" x2="373" y1="365" gradientUnits="userSpaceOnUse" y2="467" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient4" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="338" x2="338" y1="113" gradientUnits="userSpaceOnUse" y2="185" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient5" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">
+<path d="M76 46 L112 46 L112 68 L76 68 L76 46 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">
+<path d="M78 48 L112 48 L112 66 L78 66 L78 48 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
+<path d="M130 49 L273 49 L273 68 L130 68 L130 49 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
+<path d="M338 41 L338 82 L563 82 L563 53 L551 41 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
+<path d="M343 46 L538 46 L538 78 L343 78 L343 46 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
+<path d="M337 40 L565 40 L565 84 L337 84 L337 40 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath7">
+<path d="M43 223 L43 477 L640 477 L640 262 L168 262 L168 223 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath8">
+<path d="M41 221 L642 221 L642 479 L41 479 L41 221 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath9">
+<path d="M47 225 L164 225 L164 242 L47 242 L47 225 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath10">
+<path d="M47 243 L146 243 L146 260 L47 260 L47 243 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath11">
+<path d="M62 280 L325 280 L325 339 L62 339 L62 280 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath12">
+<path d="M124 283 L263 283 L263 300 L124 300 L124 283 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath13">
+<path d="M67 301 L312 301 L312 318 L67 318 L67 301 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath14">
+<path d="M62 299 L325 299 L325 339 L62 339 L62 299 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath15">
+<path d="M62 400 L325 400 L325 466 L62 466 L62 400 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath16">
+<path d="M97 403 L290 403 L290 420 L97 420 L97 403 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath17">
+<path d="M67 421 L289 421 L289 438 L67 438 L67 421 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath18">
+<path d="M62 419 L325 419 L325 466 L62 466 L62 419 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath19">
+<path d="M422 280 L587 280 L587 328 L422 328 L422 280 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath20">
+<path d="M433 295 L578 295 L578 312 L433 312 L433 295 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath21">
+<path d="M373 365 L373 466 L607 466 L607 377 L595 365 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath22">
+<path d="M378 370 L592 370 L592 462 L378 462 L378 370 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath23">
+<path d="M372 364 L609 364 L609 468 L372 468 L372 364 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath24">
+<path d="M42 261 L641 261 L641 478 L42 478 L42 261 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath25">
+<path d="M338 113 L338 184 L563 184 L563 125 L551 113 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath26">
+<path d="M343 118 L546 118 L546 180 L343 180 L343 118 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath27">
+<path d="M337 112 L565 112 L565 186 L337 186 L337 112 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath28">
+<path d="M-1 -1 L651 -1 L651 488 L-1 488 L-1 -1 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath29">
+<path d="M337 287 L403 287 L403 304 L337 304 L337 287 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath30">
+<path d="M407 298 L425 298 L425 311 L407 311 L407 298 Z"/>
+</clipPath>
+</defs>
+<g font-size="13" fill="url(#linearGradient1)" stroke-linejoin="round" stroke="url(#linearGradient1)" stroke-width="0" stroke-miterlimit="0">
+<rect x="77" y="47" clip-path="url(#clipPath1)" width="34" height="20" stroke="none"/>
+</g>
+<g font-size="13" font-family="'Arial'" stroke-linejoin="round" font-weight="bold" stroke-width="0" stroke-miterlimit="0">
+<image x="79" y="49" clip-path="url(#clipPath2)" width="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAgElEQVR42mNkgID/&#10;DKQDRjgBNmDWTuK1prnDDWFioBCwYDGVPAP+/yc+GBgZGbG4AE0CGeAznAVDBD0w&#10;CXiNBU8I43U6zHEYBsy7gMpPMsAtD5JjITXQ0AFR6QAUiLgCkoXUeEf3EgshBdii&#10;E8lLjCzExjfeHEVmbkTJTIzkZiYAPQ0grs1PsT4AAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="16" preserveAspectRatio="none" xlink:show="embed"/>
+<image x="95" y="49" clip-path="url(#clipPath2)" width="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABT0lEQVR42mNgoBAw&#10;gojuaav/k6O5NCuUkQXG8YoNIUnztsVrwDQLsqAYG8xNQAB0k13ZUayaD3VZw9lM&#10;KP4Bamb8DxEEYQuZ3wwM//4A8V8I/v+XgRFIMzIy4DAAJMAIdQSQ6M13YLCQ+w/U&#10;BDIIiP/+Zvj/7xcDkn5ULzBBZUCu+A9kF004wHDy3ncwh5HxP8xnKLaiuIAZihlh&#10;mm9/BLr6F9D2nwzmSpxAF/wCY2ZcXoD53TJjFcPJG6+Ain8yMAI1mKvyM0wqcADT&#10;ID5BL5hriDGcvPoErNBMW4ZhSqEDmD0VSKMDFBeYJM1lyO4/wDAdqNAcqPE/MxvD&#10;9CIHsJNB3mKCeo+JEYcLzs9PZjCKm8GQ2c/AMKPIATPJMjKgOB9rNF5YlMFw6twV&#10;eHTCwoURyoe5BHcYAOPp4tIceMJCdwEDMo1sAChtb2MYAAAA1AdiKtZdY1UAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="16" preserveAspectRatio="none" xlink:show="embed"/>
+</g>
+<g font-size="13" stroke-width="1.1" stroke-linecap="butt">
+<rect x="77" y="47" clip-path="url(#clipPath1)" fill="none" width="33" height="19"/>
+<text xml:space="preserve" x="131" y="63" clip-path="url(#clipPath3)" stroke="none">HelloWorldComponent</text>
+<rect x="338" y="41" clip-path="url(#clipPath4)" fill="url(#linearGradient2)" width="226" height="42" stroke="none"/>
+<text x="344" font-size="12" y="59" clip-path="url(#clipPath5)" stroke="none" xml:space="preserve">Cross references to composite</text>
+<text x="344" font-size="12" y="74" clip-path="url(#clipPath5)" stroke="none" xml:space="preserve">diagram</text>
+<line clip-path="url(#clipPath6)" fill="none" x1="338" x2="551" y1="41" y2="41"/>
+<line clip-path="url(#clipPath6)" fill="none" x1="551" x2="563" y1="41" y2="53"/>
+<line clip-path="url(#clipPath6)" fill="none" x1="563" x2="563" y1="53" y2="82"/>
+<line clip-path="url(#clipPath6)" fill="none" x1="563" x2="338" y1="82" y2="82"/>
+<line clip-path="url(#clipPath6)" fill="none" x1="338" x2="338" y1="82" y2="41"/>
+<line clip-path="url(#clipPath6)" fill="none" x1="338" x2="338" y1="41" y2="41"/>
+<line clip-path="url(#clipPath6)" fill="none" x1="551" x2="551" y1="41" y2="53"/>
+<line clip-path="url(#clipPath6)" fill="none" x1="551" x2="564" y1="53" y2="53"/>
+<rect x="43" y="223" clip-path="url(#clipPath7)" fill="url(#linearGradient3)" width="597" height="254" stroke="none"/>
+<line clip-path="url(#clipPath8)" fill="none" x1="43" x2="168" y1="223" y2="223"/>
+<line clip-path="url(#clipPath8)" fill="none" x1="168" x2="168" y1="223" y2="262"/>
+<line clip-path="url(#clipPath8)" fill="none" x1="168" x2="640" y1="262" y2="262"/>
+<line clip-path="url(#clipPath8)" fill="none" x1="640" x2="640" y1="262" y2="477"/>
+<line clip-path="url(#clipPath8)" fill="none" x1="640" x2="43" y1="477" y2="477"/>
+<line clip-path="url(#clipPath8)" fill="none" x1="43" x2="43" y1="477" y2="223"/>
+<text x="48" font-size="12" y="238" clip-path="url(#clipPath9)" stroke="none" xml:space="preserve">«DeploymentPlan»</text>
+<text x="48" font-size="12" y="256" clip-path="url(#clipPath10)" stroke="none" xml:space="preserve">SystemDepPlan</text>
+<rect x="63" y="281" clip-path="url(#clipPath11)" fill="white" width="261" rx="0" ry="0" height="57" stroke="none"/>
+<text x="125" font-size="12" y="296" clip-path="url(#clipPath12)" stroke="none" xml:space="preserve">mainInstance: System</text>
+<text x="68" font-size="12" y="314" clip-path="url(#clipPath13)" stroke="none" xml:space="preserve">hello : HelloWorld = mainInstance.hello</text>
+<line clip-path="url(#clipPath14)" fill="none" x1="63" x2="324" y1="300" y2="300"/>
+<rect x="63" y="281" clip-path="url(#clipPath11)" fill="none" width="260" rx="0" ry="0" height="56"/>
+<rect x="63" y="401" clip-path="url(#clipPath15)" fill="white" width="261" rx="0" ry="0" height="64" stroke="none"/>
+<text x="98" font-size="12" y="416" clip-path="url(#clipPath16)" stroke="none" xml:space="preserve">mainInstance.hello: HelloWorld</text>
+<text x="68" font-size="12" y="434" clip-path="url(#clipPath17)" stroke="none" xml:space="preserve">message : String = "Test message"</text>
+<line clip-path="url(#clipPath18)" fill="none" x1="63" x2="324" y1="420" y2="420"/>
+<rect x="63" y="401" clip-path="url(#clipPath15)" fill="none" width="260" rx="0" ry="0" height="63"/>
+<rect x="423" y="281" clip-path="url(#clipPath19)" fill="white" width="163" rx="0" ry="0" height="46" stroke="none"/>
+<text x="434" font-size="12" y="308" clip-path="url(#clipPath20)" stroke="none" xml:space="preserve">monoNode: MonoNode</text>
+<rect x="423" y="281" clip-path="url(#clipPath19)" fill="none" width="162" rx="0" ry="0" height="45"/>
+<rect x="373" y="365" clip-path="url(#clipPath21)" fill="url(#linearGradient4)" width="235" height="102" stroke="none"/>
+<text x="379" font-size="12" y="383" clip-path="url(#clipPath22)" stroke="none" xml:space="preserve">Value mainInstance.hello is a UML</text>
+<text x="379" font-size="12" y="398" clip-path="url(#clipPath22)" stroke="none" xml:space="preserve">instance-value, i.e. a reference to</text>
+<text x="379" font-size="12" y="413" clip-path="url(#clipPath22)" stroke="none" xml:space="preserve">the instance specification on the</text>
+<text x="379" font-size="12" y="428" clip-path="url(#clipPath22)" stroke="none" xml:space="preserve">left.</text>
+<text x="379" font-size="12" y="443" clip-path="url(#clipPath22)" stroke="none" xml:space="preserve">"Test message" is a StringValue</text>
+<text x="379" font-size="12" y="458" clip-path="url(#clipPath22)" stroke="none" xml:space="preserve">initializing the message attribute</text>
+<line clip-path="url(#clipPath23)" fill="none" x1="373" x2="595" y1="365" y2="365"/>
+<line clip-path="url(#clipPath23)" fill="none" x1="595" x2="607" y1="365" y2="377"/>
+<line clip-path="url(#clipPath23)" fill="none" x1="607" x2="607" y1="377" y2="466"/>
+<line clip-path="url(#clipPath23)" fill="none" x1="607" x2="373" y1="466" y2="466"/>
+<line clip-path="url(#clipPath23)" fill="none" x1="373" x2="373" y1="466" y2="365"/>
+<line clip-path="url(#clipPath23)" fill="none" x1="373" x2="373" y1="365" y2="365"/>
+<line clip-path="url(#clipPath23)" fill="none" x1="595" x2="595" y1="365" y2="377"/>
+<line clip-path="url(#clipPath23)" fill="none" x1="595" x2="608" y1="377" y2="377"/>
+<line clip-path="url(#clipPath24)" fill="none" x1="43" x2="640" y1="262" y2="262"/>
+<rect x="338" y="113" clip-path="url(#clipPath25)" fill="url(#linearGradient5)" width="226" height="72" stroke="none"/>
+<text x="344" font-size="12" y="131" clip-path="url(#clipPath26)" stroke="none" xml:space="preserve">Deployment plan for system, i.e.</text>
+<text x="344" font-size="12" y="146" clip-path="url(#clipPath26)" stroke="none" xml:space="preserve">set of instance specification</text>
+<text x="344" font-size="12" y="161" clip-path="url(#clipPath26)" stroke="none" xml:space="preserve">along with configuration and</text>
+<text x="344" font-size="12" y="176" clip-path="url(#clipPath26)" stroke="none" xml:space="preserve">allocation</text>
+<line clip-path="url(#clipPath27)" fill="none" x1="338" x2="551" y1="113" y2="113"/>
+<line clip-path="url(#clipPath27)" fill="none" x1="551" x2="563" y1="113" y2="125"/>
+<line clip-path="url(#clipPath27)" fill="none" x1="563" x2="563" y1="125" y2="184"/>
+<line clip-path="url(#clipPath27)" fill="none" x1="563" x2="338" y1="184" y2="184"/>
+<line clip-path="url(#clipPath27)" fill="none" x1="338" x2="338" y1="184" y2="113"/>
+<line clip-path="url(#clipPath27)" fill="none" x1="338" x2="338" y1="113" y2="113"/>
+<line clip-path="url(#clipPath27)" fill="none" x1="551" x2="551" y1="113" y2="125"/>
+<line clip-path="url(#clipPath27)" fill="none" x1="551" x2="564" y1="125" y2="125"/>
+<line clip-path="url(#clipPath28)" fill="none" text-rendering="optimizeLegibility" x1="324" x2="423" y1="304" y2="304" stroke-dasharray="5,5,5,5,5,5,5,5,5,5"/>
+<text x="338" font-size="12" y="300" clip-path="url(#clipPath29)" text-rendering="optimizeLegibility" stroke-dasharray="5,5,5,5,5,5,5,5,5,5" stroke="none" xml:space="preserve">«Allocate»</text>
+<line clip-path="url(#clipPath30)" fill="none" text-rendering="optimizeLegibility" x1="408" x2="423" y1="309" y2="304"/>
+<line clip-path="url(#clipPath30)" fill="none" text-rendering="optimizeLegibility" x1="423" x2="408" y1="304" y2="299"/>
+<line clip-path="url(#clipPath28)" fill="none" text-rendering="optimizeLegibility" x1="373" x2="259" y1="377" y2="377" stroke-dasharray="6.6,3.3"/>
+<line clip-path="url(#clipPath28)" fill="none" text-rendering="optimizeLegibility" x1="259" x2="259" y1="377" y2="338" stroke-dasharray="6.6,3.3"/>
+<line clip-path="url(#clipPath28)" fill="none" text-rendering="optimizeLegibility" x1="373" x2="324" y1="430" y2="430" stroke-dasharray="6.6,3.3"/>
+<line clip-path="url(#clipPath28)" fill="none" text-rendering="optimizeLegibility" x1="324" x2="423" y1="304" y2="304" stroke-dasharray="5,5,5,5,5,5,5,5,5,5"/>
+<text x="338" font-size="12" y="300" clip-path="url(#clipPath29)" text-rendering="optimizeLegibility" stroke-dasharray="5,5,5,5,5,5,5,5,5,5" stroke="none" xml:space="preserve">«Allocate»</text>
+<line clip-path="url(#clipPath30)" fill="none" text-rendering="optimizeLegibility" x1="408" x2="423" y1="309" y2="304"/>
+<line clip-path="url(#clipPath30)" fill="none" text-rendering="optimizeLegibility" x1="423" x2="408" y1="304" y2="299"/>
+<line clip-path="url(#clipPath28)" fill="none" text-rendering="optimizeLegibility" x1="338" x2="154" y1="151" y2="151" stroke-dasharray="6.6,3.3"/>
+<line clip-path="url(#clipPath28)" fill="none" text-rendering="optimizeLegibility" x1="154" x2="154" y1="151" y2="223" stroke-dasharray="6.6,3.3"/>
+<line clip-path="url(#clipPath28)" fill="none" text-rendering="optimizeLegibility" x1="373" x2="259" y1="377" y2="377" stroke-dasharray="6.6,3.3"/>
+<line clip-path="url(#clipPath28)" fill="none" text-rendering="optimizeLegibility" x1="259" x2="259" y1="377" y2="338" stroke-dasharray="6.6,3.3"/>
+<line clip-path="url(#clipPath28)" fill="none" text-rendering="optimizeLegibility" x1="373" x2="324" y1="430" y2="430" stroke-dasharray="6.6,3.3"/>
+</g>
+</g>
+</svg>
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-platform.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-platform.png
new file mode 100644
index 00000000000..b13395ea580
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-platform.png
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-platform.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-platform.svg
new file mode 100644
index 00000000000..a2b99233272
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-platform.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-dasharray="none" shape-rendering="auto" font-family="'Dialog'" width="648" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-interpolation="auto" color-rendering="auto" preserveAspectRatio="xMidYMid meet" font-size="12" viewBox="0 0 648 254" fill="black" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="254" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">
+<!--Generated by the Batik Graphics2D SVG Generator-->
+<defs id="genericDefs"/>
+<g>
+<defs id="defs1">
+<linearGradient x1="10" x2="10" y1="10" gradientUnits="userSpaceOnUse" y2="164" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient1" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(166,193,152)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="370" x2="370" y1="10" gradientUnits="userSpaceOnUse" y2="117" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient2" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="361" x2="361" y1="164" gradientUnits="userSpaceOnUse" y2="244" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient3" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">
+<path d="M10 10 L10 163 L310 163 L310 10 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">
+<path d="M128 12 L192 12 L192 31 L128 31 L128 12 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
+<path d="M54 55 L273 55 L273 139 L54 139 L54 55 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
+<path d="M85 87 L243 87 L243 106 L85 106 L85 87 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
+<path d="M9 30 L312 30 L312 165 L9 165 L9 30 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
+<path d="M9 9 L312 9 L312 165 L9 165 L9 9 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath7">
+<path d="M370 10 L370 116 L607 116 L607 10 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath8">
+<path d="M464 9 L516 9 L516 28 L464 28 L464 9 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath9">
+<path d="M450 27 L529 27 L529 46 L450 46 L450 27 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath10">
+<path d="M463 46 L517 46 L517 63 L463 63 L463 46 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath11">
+<path d="M375 62 L532 62 L532 79 L375 79 L375 62 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath12">
+<path d="M375 77 L435 77 L435 94 L375 94 L375 77 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath13">
+<path d="M375 92 L436 92 L436 109 L375 109 L375 92 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath14">
+<path d="M370 45 L609 45 L609 118 L370 118 L370 45 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath15">
+<path d="M369 9 L609 9 L609 118 L369 118 L369 9 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath16">
+<path d="M361 164 L361 243 L637 243 L637 176 L625 164 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath17">
+<path d="M366 169 L622 169 L622 239 L366 239 L366 169 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath18">
+<path d="M360 163 L639 163 L639 245 L360 245 L360 163 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath19">
+<path d="M-1 -1 L649 -1 L649 255 L-1 255 L-1 -1 Z"/>
+</clipPath>
+</defs>
+<g fill="url(#linearGradient1)" stroke-miterlimit="0" stroke-width="0" stroke="url(#linearGradient1)" stroke-linejoin="round">
+<rect x="10" y="10" clip-path="url(#clipPath1)" width="301" height="154" stroke="none"/>
+<text x="129" font-size="13" y="26" clip-path="url(#clipPath2)" fill="black" stroke="none" xml:space="preserve">Platform  </text>
+<rect x="55" y="56" clip-path="url(#clipPath3)" fill="white" width="217" rx="0" ry="0" height="82" stroke="none"/>
+<text x="86" font-size="13" y="101" clip-path="url(#clipPath4)" fill="black" stroke="none" xml:space="preserve">  monoNode: MonoNode</text>
+</g>
+<g stroke-linecap="butt" stroke-width="1.1">
+<rect x="55" y="56" clip-path="url(#clipPath3)" fill="none" width="216" rx="0" ry="0" height="81"/>
+<line clip-path="url(#clipPath5)" fill="none" x1="10" x2="311" y1="31" y2="31"/>
+<rect x="10" y="10" clip-path="url(#clipPath6)" fill="none" width="300" rx="0" ry="0" height="153"/>
+<rect x="370" y="10" clip-path="url(#clipPath7)" fill="url(#linearGradient2)" width="238" height="107" stroke="none"/>
+<text x="465" font-size="13" y="23" clip-path="url(#clipPath8)" stroke="none" xml:space="preserve">«Node»</text>
+<text x="451" font-size="13" y="41" clip-path="url(#clipPath9)" stroke="none" xml:space="preserve">MonoNode  </text>
+<text xml:space="preserve" x="464" y="59" clip-path="url(#clipPath10)" stroke="none">«Target»</text>
+<text xml:space="preserve" x="376" y="75" clip-path="url(#clipPath11)" stroke="none">targetArch=StandardPC </text>
+<text xml:space="preserve" x="376" y="90" clip-path="url(#clipPath12)" stroke="none">availRAM </text>
+<text xml:space="preserve" x="376" y="105" clip-path="url(#clipPath13)" stroke="none">availROM </text>
+<line clip-path="url(#clipPath14)" fill="none" x1="370" x2="608" y1="46" y2="46"/>
+<line clip-path="url(#clipPath15)" fill="none" x1="370" x2="608" y1="46" y2="46"/>
+<rect x="370" y="10" clip-path="url(#clipPath15)" fill="none" width="237" rx="0" ry="0" height="106"/>
+<rect x="361" y="164" clip-path="url(#clipPath16)" fill="url(#linearGradient3)" width="277" height="80" stroke="none"/>
+<text x="367" font-size="13" y="183" clip-path="url(#clipPath17)" stroke="none" xml:space="preserve">Simple single node configuration.</text>
+<text x="367" font-size="13" y="200" clip-path="url(#clipPath17)" stroke="none" xml:space="preserve">TargetOS is set to Linux, but will work on</text>
+<text x="367" font-size="13" y="217" clip-path="url(#clipPath17)" stroke="none" xml:space="preserve">any OS, since this simple example does</text>
+<text x="367" font-size="13" y="234" clip-path="url(#clipPath17)" stroke="none" xml:space="preserve">not use the OS abstraction layer</text>
+<line clip-path="url(#clipPath18)" fill="none" x1="361" x2="625" y1="164" y2="164"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="625" x2="637" y1="164" y2="176"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="637" x2="637" y1="176" y2="243"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="637" x2="361" y1="243" y2="243"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="361" x2="361" y1="243" y2="164"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="361" x2="361" y1="164" y2="164"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="625" x2="625" y1="164" y2="176"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="625" x2="638" y1="176" y2="176"/>
+<line clip-path="url(#clipPath19)" fill="none" text-rendering="optimizeLegibility" x1="471" x2="471" y1="164" y2="117" stroke-dasharray="6.6,3.3"/>
+</g>
+</g>
+</svg>
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-system.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-system.png
new file mode 100644
index 00000000000..18b6c1ac5d2
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-system.png
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-system.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-system.svg
new file mode 100644
index 00000000000..3d1b27ed68f
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/HelloWorld-system.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-dasharray="none" shape-rendering="auto" font-family="'Dialog'" width="300" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-interpolation="auto" color-rendering="auto" preserveAspectRatio="xMidYMid meet" font-size="12" viewBox="0 0 300 192" fill="black" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="192" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">
+<!--Generated by the Batik Graphics2D SVG Generator-->
+<defs id="genericDefs"/>
+<g>
+<defs id="defs1">
+<linearGradient x1="10" x2="10" y1="10" gradientUnits="userSpaceOnUse" y2="182" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient1" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(225,225,135)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="45" x2="45" y1="91" gradientUnits="userSpaceOnUse" y2="111" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient2" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">
+<path d="M10 10 L10 181 L289 181 L289 10 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">
+<path d="M120 12 L179 12 L179 31 L120 31 L120 12 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
+<path d="M54 56 L249 56 L249 143 L54 143 L54 56 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
+<path d="M94 59 L208 59 L208 78 L94 78 L94 59 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
+<path d="M54 77 L249 77 L249 143 L54 143 L54 77 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
+<path d="M45 91 L45 110 L64 110 L64 91 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath7">
+<path d="M44 90 L66 90 L66 112 L44 112 L44 90 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath8">
+<path d="M69 93 L151 93 L151 110 L69 110 L69 93 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath9">
+<path d="M9 30 L291 30 L291 183 L9 183 L9 30 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath10">
+<path d="M9 9 L291 9 L291 183 L9 183 L9 9 Z"/>
+</clipPath>
+</defs>
+<g fill="url(#linearGradient1)" stroke-miterlimit="0" stroke-width="0" stroke="url(#linearGradient1)" stroke-linejoin="round">
+<rect x="10" y="10" clip-path="url(#clipPath1)" width="280" height="172" stroke="none"/>
+<text x="121" font-size="13" y="26" clip-path="url(#clipPath2)" fill="black" stroke="none" xml:space="preserve">System  </text>
+<rect x="55" y="57" clip-path="url(#clipPath3)" fill="white" width="193" rx="0" ry="0" height="85" stroke="none"/>
+<text x="95" font-size="13" y="73" clip-path="url(#clipPath4)" fill="black" stroke="none" xml:space="preserve">  hello: HelloWorld</text>
+</g>
+<g stroke-linecap="butt" stroke-width="1.1">
+<line clip-path="url(#clipPath5)" fill="none" x1="55" x2="248" y1="78" y2="78"/>
+<rect x="55" y="57" clip-path="url(#clipPath3)" fill="none" width="192" rx="0" ry="0" height="84"/>
+<rect x="45" y="91" clip-path="url(#clipPath6)" fill="url(#linearGradient2)" width="20" height="20" stroke="none"/>
+<rect x="45" y="91" clip-path="url(#clipPath7)" fill="none" width="19" rx="0" ry="0" height="19"/>
+<text xml:space="preserve" x="70" y="106" clip-path="url(#clipPath8)" stroke="none">  start: IStart</text>
+<line clip-path="url(#clipPath9)" fill="none" x1="10" x2="290" y1="31" y2="31"/>
+<rect x="10" y="10" clip-path="url(#clipPath10)" fill="none" width="279" rx="0" ry="0" height="171"/>
+</g>
+</g>
+</svg>
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-pullcon.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-pullcon.png
new file mode 100644
index 00000000000..b624fed7ea6
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-pullcon.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-pullcon.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-pullcon.svg
index 4336e615b78..4336e615b78 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-pullcon.svg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-pullcon.svg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.pdf b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.pdf
index 4a05698fb4f..4a05698fb4f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.pdf
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.pdf
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.png
new file mode 100644
index 00000000000..f1b72e82fa3
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.svg
index aa89a2be691..aa89a2be691 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.svg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/figs/ProducerConsumer-sys.svg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.di
index 4af45b41bca..4af45b41bca 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.notation
index 52a0b8e9ee1..52a0b8e9ee1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.uml
index 16504ba6e28..16504ba6e28 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corba.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di
index c60a23070a9..c60a23070a9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation
index a64f663c8c1..a64f663c8c1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml
index f028cc3615c..f028cc3615c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.di
index b319be2de9c..b319be2de9c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.notation
index ce60a488a78..ce60a488a78 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.uml
index 1570093713d..1570093713d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corec.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.di
index bbc117e6eff..bbc117e6eff 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.notation
index 3af00ab51ac..3af00ab51ac 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.uml
index 1570093713d..1570093713d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/corecpp.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.di
index 169236cea8a..169236cea8a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.notation
index d1c8d75a52d..d1c8d75a52d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.uml
index 9b65b43823d..9b65b43823d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/fifo.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/In.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/In.png
index 74dfe916ca6..74dfe916ca6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/In.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/In.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/In.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/In.svg
index 42b2257c295..42b2257c295 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/In.svg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/In.svg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/InOut.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/InOut.png
index 75ba94039ae..75ba94039ae 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/InOut.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/InOut.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/InOut.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/InOut.svg
index bc6bba9e681..bc6bba9e681 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/InOut.svg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/InOut.svg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Out.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Out.png
index 5fb219bc960..5fb219bc960 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Out.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Out.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Out.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Out.svg
index ef00466fc55..ef00466fc55 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Out.svg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Out.svg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Provided.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Provided.png
index f84ec4584ea..f84ec4584ea 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Provided.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Provided.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Provided.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Provided.svg
index 3d3f1f8259f..3d3f1f8259f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Provided.svg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Provided.svg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/ProvidedRequired.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/ProvidedRequired.png
index b89b982bf35..b89b982bf35 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/ProvidedRequired.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/ProvidedRequired.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/ProvidedRequired.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/ProvidedRequired.svg
index 7572b29a6d6..7572b29a6d6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/ProvidedRequired.svg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/ProvidedRequired.svg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Required.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Required.png
index 81cf72f17b5..81cf72f17b5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Required.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Required.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Required.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Required.svg
index 0b555b8f3fc..0b555b8f3fc 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Required.svg
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/Required.svg
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/In.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/In.png
index 74dfe916ca6..74dfe916ca6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/In.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/In.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/InOut.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/InOut.png
index 75ba94039ae..75ba94039ae 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/InOut.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/InOut.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Out.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Out.png
index 5fb219bc960..5fb219bc960 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Out.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Out.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Provided.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Provided.png
index f84ec4584ea..f84ec4584ea 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Provided.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Provided.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/ProvidedRequired.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/ProvidedRequired.png
index b89b982bf35..b89b982bf35 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/ProvidedRequired.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/ProvidedRequired.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Required.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Required.png
index 81cf72f17b5..81cf72f17b5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Required.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/hires/Required.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/In.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/In.png
index 6a58521116d..6a58521116d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/In.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/In.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/InOut.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/InOut.png
index f054cdefbc2..f054cdefbc2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/InOut.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/InOut.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Out.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Out.png
index 91c7eef436d..91c7eef436d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Out.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Out.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Provided.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Provided.png
index 9403c7fc698..9403c7fc698 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Provided.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Provided.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/ProvidedRequired.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/ProvidedRequired.png
index 6b26d4fcaf6..6b26d4fcaf6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/ProvidedRequired.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/ProvidedRequired.png
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Required.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Required.png
index 569d4d982e9..569d4d982e9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Required.png
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/lowres/Required.png
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/port-kinds.png b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/port-kinds.png
new file mode 100644
index 00000000000..d96987f2286
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/port-kinds.png
diff --git a/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/port-kinds.svg b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/port-kinds.svg
new file mode 100644
index 00000000000..82afdbab647
--- /dev/null
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/figs/port-kinds.svg
@@ -0,0 +1,551 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-dasharray="none" shape-rendering="auto" font-family="'Dialog'" width="1137" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-interpolation="auto" color-rendering="auto" preserveAspectRatio="xMidYMid meet" font-size="12" viewBox="0 0 1137 709" fill="black" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="709" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">
+<!--Generated by the Batik Graphics2D SVG Generator-->
+<defs id="genericDefs"/>
+<g>
+<defs id="defs1">
+<linearGradient x1="46" x2="46" y1="458" gradientUnits="userSpaceOnUse" y2="495" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient1" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="46" x2="46" y1="404" gradientUnits="userSpaceOnUse" y2="441" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient2" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="226" x2="226" y1="350" gradientUnits="userSpaceOnUse" y2="387" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient3" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="245" x2="245" y1="404" gradientUnits="userSpaceOnUse" y2="446" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient4" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="424" x2="424" y1="350" gradientUnits="userSpaceOnUse" y2="392" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient5" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="244" x2="244" y1="458" gradientUnits="userSpaceOnUse" y2="500" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient6" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="10" x2="10" y1="566" gradientUnits="userSpaceOnUse" y2="608" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient7" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="46" x2="46" y1="512" gradientUnits="userSpaceOnUse" y2="549" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient8" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="244" x2="244" y1="512" gradientUnits="userSpaceOnUse" y2="554" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient9" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="13" x2="13" y1="625" gradientUnits="userSpaceOnUse" y2="686" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient10" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="297" x2="297" y1="628" gradientUnits="userSpaceOnUse" y2="699" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient11" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="32" x2="32" y1="30" gradientUnits="userSpaceOnUse" y2="331" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient12" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="272" x2="272" y1="70" gradientUnits="userSpaceOnUse" y2="107" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient13" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="272" x2="272" y1="130" gradientUnits="userSpaceOnUse" y2="167" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient14" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="272" x2="272" y1="190" gradientUnits="userSpaceOnUse" y2="227" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient15" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="272" x2="272" y1="250" gradientUnits="userSpaceOnUse" y2="287" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient16" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<linearGradient x1="472" x2="472" y1="70" gradientUnits="userSpaceOnUse" y2="110" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient17" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="472" x2="472" y1="130" gradientUnits="userSpaceOnUse" y2="165" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient18" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="472" x2="472" y1="190" gradientUnits="userSpaceOnUse" y2="232" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient19" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="472" x2="472" y1="250" gradientUnits="userSpaceOnUse" y2="307" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient20" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="rgb(255,255,204)" offset="0%"/>
+<stop stop-opacity="1" stop-color="white" offset="100%"/>
+</linearGradient>
+<linearGradient x1="52" x2="52" y1="70" gradientUnits="userSpaceOnUse" y2="171" xlink:type="simple" xlink:actuate="onLoad" id="linearGradient21" xlink:show="other" spreadMethod="pad">
+<stop stop-opacity="1" stop-color="white" offset="0%"/>
+<stop stop-opacity="1" stop-color="rgb(195,209,213)" offset="100%"/>
+</linearGradient>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">
+<path d="M46 458 L46 494 L172 494 L172 458 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">
+<path d="M76 460 L144 460 L144 477 L76 477 L76 460 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
+<path d="M67 476 L154 476 L154 493 L67 493 L67 476 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
+<path d="M45 457 L174 457 L174 496 L45 496 L45 457 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
+<path d="M46 404 L46 440 L172 440 L172 404 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
+<path d="M76 406 L144 406 L144 423 L76 423 L76 406 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath7">
+<path d="M62 422 L158 422 L158 439 L62 439 L62 422 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath8">
+<path d="M45 403 L174 403 L174 442 L45 442 L45 403 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath9">
+<path d="M226 350 L226 386 L352 386 L352 350 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath10">
+<path d="M256 352 L324 352 L324 369 L256 369 L256 352 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath11">
+<path d="M245 368 L335 368 L335 385 L245 385 L245 368 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath12">
+<path d="M225 349 L354 349 L354 388 L225 388 L225 349 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath13">
+<path d="M245 404 L245 445 L712 445 L712 416 L700 404 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath14">
+<path d="M250 409 L690 409 L690 441 L250 441 L250 409 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath15">
+<path d="M244 403 L714 403 L714 447 L244 447 L244 403 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath16">
+<path d="M424 350 L424 391 L891 391 L891 362 L879 350 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath17">
+<path d="M429 355 L856 355 L856 387 L429 387 L429 355 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath18">
+<path d="M423 349 L893 349 L893 393 L423 393 L423 349 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath19">
+<path d="M244 458 L244 499 L711 499 L711 470 L699 458 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath20">
+<path d="M249 463 L683 463 L683 495 L249 495 L249 463 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath21">
+<path d="M243 457 L713 457 L713 501 L243 501 L243 457 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath22">
+<path d="M10 566 L10 607 L604 607 L604 578 L592 566 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath23">
+<path d="M15 571 L585 571 L585 603 L15 603 L15 571 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath24">
+<path d="M9 565 L606 565 L606 609 L9 609 L9 565 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath25">
+<path d="M46 512 L46 548 L172 548 L172 512 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath26">
+<path d="M76 514 L144 514 L144 531 L76 531 L76 514 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath27">
+<path d="M53 530 L168 530 L168 547 L53 547 L53 530 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath28">
+<path d="M45 511 L174 511 L174 550 L45 550 L45 511 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath29">
+<path d="M244 512 L244 553 L712 553 L712 524 L700 512 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath30">
+<path d="M249 517 L644 517 L644 549 L249 549 L249 517 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath31">
+<path d="M243 511 L714 511 L714 555 L243 555 L243 511 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath32">
+<path d="M13 625 L13 685 L236 685 L236 625 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath33">
+<path d="M89 627 L161 627 L161 644 L89 644 L89 627 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath34">
+<path d="M12 643 L238 643 L238 661 L12 661 L12 643 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath35">
+<path d="M32 643 L237 643 L237 660 L32 660 L32 643 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath36">
+<path d="M12 660 L238 660 L238 687 L12 687 L12 660 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath37">
+<path d="M12 624 L238 624 L238 687 L12 687 L12 624 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath38">
+<path d="M297 628 L297 698 L611 698 L611 640 L599 628 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath39">
+<path d="M302 633 L589 633 L589 680 L302 680 L302 633 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath40">
+<path d="M296 627 L613 627 L613 700 L296 700 L296 627 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath41">
+<path d="M32 30 L32 331 L1093 331 L1093 52 L156 52 L156 30 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath42">
+<path d="M30 28 L1095 28 L1095 333 L30 333 L30 28 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath43">
+<path d="M31 32 L1094 32 L1094 52 L31 52 L31 32 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath44">
+<path d="M55 32 L152 32 L152 49 L55 49 L55 32 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath45">
+<path d="M272 70 L272 106 L398 106 L398 70 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath46">
+<path d="M302 72 L370 72 L370 89 L302 89 L302 72 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath47">
+<path d="M284 88 L388 88 L388 105 L284 105 L284 88 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath48">
+<path d="M271 69 L400 69 L400 108 L271 108 L271 69 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath49">
+<path d="M272 130 L272 166 L398 166 L398 130 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath50">
+<path d="M302 132 L370 132 L370 149 L302 149 L302 132 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath51">
+<path d="M295 148 L377 148 L377 165 L295 165 L295 148 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath52">
+<path d="M271 129 L400 129 L400 168 L271 168 L271 129 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath53">
+<path d="M272 190 L272 226 L398 226 L398 190 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath54">
+<path d="M302 192 L370 192 L370 209 L302 209 L302 192 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath55">
+<path d="M314 208 L359 208 L359 225 L314 225 L314 208 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath56">
+<path d="M271 189 L400 189 L400 228 L271 228 L271 189 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath57">
+<path d="M272 250 L272 286 L398 286 L398 250 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath58">
+<path d="M302 252 L370 252 L370 269 L302 269 L302 252 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath59">
+<path d="M299 268 L373 268 L373 285 L299 285 L299 268 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath60">
+<path d="M271 249 L400 249 L400 288 L271 288 L271 249 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath61">
+<path d="M472 70 L472 109 L940 109 L940 82 L928 70 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath62">
+<path d="M477 75 L835 75 L835 92 L477 92 L477 75 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath63">
+<path d="M471 69 L942 69 L942 111 L471 111 L471 69 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath64">
+<path d="M472 130 L472 164 L940 164 L940 142 L928 130 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath65">
+<path d="M477 135 L834 135 L834 152 L477 152 L477 135 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath66">
+<path d="M471 129 L942 129 L942 166 L471 166 L471 129 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath67">
+<path d="M472 190 L472 231 L940 231 L940 202 L928 190 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath68">
+<path d="M477 195 L921 195 L921 227 L477 227 L477 195 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath69">
+<path d="M471 189 L942 189 L942 233 L471 233 L471 189 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath70">
+<path d="M472 250 L472 306 L940 306 L940 262 L928 250 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath71">
+<path d="M477 255 L917 255 L917 302 L477 302 L477 255 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath72">
+<path d="M471 249 L942 249 L942 308 L471 308 L471 249 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath73">
+<path d="M52 70 L52 170 L172 170 L172 70 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath74">
+<path d="M77 104 L149 104 L149 121 L77 121 L77 104 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath75">
+<path d="M52 120 L174 120 L174 138 L52 138 L52 120 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath76">
+<path d="M120 120 L125 120 L125 137 L120 137 L120 120 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath77">
+<path d="M51 69 L174 69 L174 172 L51 172 L51 69 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath78">
+<path d="M31 51 L1094 51 L1094 332 L31 332 L31 51 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath79">
+<path d="M1039 9 L1128 9 L1128 51 L1039 51 L1039 9 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath80">
+<path d="M1044 11 L1113 11 L1113 28 L1044 28 L1044 11 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath81">
+<path d="M1039 9 L1124 9 L1124 47 L1039 47 L1039 9 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath82">
+<path d="M1039 9 L1130 9 L1130 53 L1039 53 L1039 9 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath83">
+<path d="M-1 -1 L1138 -1 L1138 710 L-1 710 L-1 -1 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath84">
+<path d="M210 82 L235 82 L235 99 L210 99 L210 82 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath85">
+<path d="M172 144 L190 144 L190 157 L172 157 L172 144 Z"/>
+</clipPath>
+<clipPath clipPathUnits="userSpaceOnUse" id="clipPath86">
+<path d="M172 84 L190 84 L190 97 L172 97 L172 84 Z"/>
+</clipPath>
+</defs>
+<g fill="url(#linearGradient1)" stroke-miterlimit="0" stroke-width="0" stroke="url(#linearGradient1)" stroke-linejoin="round">
+<rect x="46" y="458" clip-path="url(#clipPath1)" width="127" height="37" stroke="none"/>
+<text x="77" y="473" clip-path="url(#clipPath2)" fill="black" stroke="none" xml:space="preserve">«PortKind»</text>
+<text x="68" y="489" clip-path="url(#clipPath3)" fill="black" stroke="none" xml:space="preserve">PullConsumer</text>
+</g>
+<g stroke-linecap="butt" stroke-width="1.1">
+<rect x="46" y="458" clip-path="url(#clipPath4)" fill="none" width="126" rx="0" ry="0" height="36"/>
+<rect x="46" y="404" clip-path="url(#clipPath5)" fill="url(#linearGradient2)" width="127" height="37" stroke="none"/>
+<text xml:space="preserve" x="77" y="419" clip-path="url(#clipPath6)" stroke="none">«PortKind»</text>
+<text xml:space="preserve" x="63" y="435" clip-path="url(#clipPath7)" stroke="none">PushConsumer</text>
+<rect x="46" y="404" clip-path="url(#clipPath8)" fill="none" width="126" rx="0" ry="0" height="36"/>
+<rect x="226" y="350" clip-path="url(#clipPath9)" fill="url(#linearGradient3)" width="127" height="37" stroke="none"/>
+<text xml:space="preserve" x="257" y="365" clip-path="url(#clipPath10)" stroke="none">«PortKind»</text>
+<text xml:space="preserve" x="246" y="381" clip-path="url(#clipPath11)" stroke="none">PushProducer</text>
+<rect x="226" y="350" clip-path="url(#clipPath12)" fill="none" width="126" rx="0" ry="0" height="36"/>
+<rect x="245" y="404" clip-path="url(#clipPath13)" fill="url(#linearGradient4)" width="468" height="42" stroke="none"/>
+<text xml:space="preserve" x="251" y="422" clip-path="url(#clipPath14)" stroke="none">Data Flow oriented communication: consume passively: provided push</text>
+<text xml:space="preserve" x="251" y="437" clip-path="url(#clipPath14)" stroke="none">operation is called </text>
+<line clip-path="url(#clipPath15)" fill="none" x1="245" x2="700" y1="404" y2="404"/>
+<line clip-path="url(#clipPath15)" fill="none" x1="700" x2="712" y1="404" y2="416"/>
+<line clip-path="url(#clipPath15)" fill="none" x1="712" x2="712" y1="416" y2="445"/>
+<line clip-path="url(#clipPath15)" fill="none" x1="712" x2="245" y1="445" y2="445"/>
+<line clip-path="url(#clipPath15)" fill="none" x1="245" x2="245" y1="445" y2="404"/>
+<line clip-path="url(#clipPath15)" fill="none" x1="245" x2="245" y1="404" y2="404"/>
+<line clip-path="url(#clipPath15)" fill="none" x1="700" x2="700" y1="404" y2="416"/>
+<line clip-path="url(#clipPath15)" fill="none" x1="700" x2="713" y1="416" y2="416"/>
+<rect x="424" y="350" clip-path="url(#clipPath16)" fill="url(#linearGradient5)" width="468" height="42" stroke="none"/>
+<text xml:space="preserve" x="430" y="368" clip-path="url(#clipPath17)" stroke="none">Data Flow oriented communication: produce data via pushing these</text>
+<text xml:space="preserve" x="430" y="383" clip-path="url(#clipPath17)" stroke="none">(calling the required operation) </text>
+<line clip-path="url(#clipPath18)" fill="none" x1="424" x2="879" y1="350" y2="350"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="879" x2="891" y1="350" y2="362"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="891" x2="891" y1="362" y2="391"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="891" x2="424" y1="391" y2="391"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="424" x2="424" y1="391" y2="350"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="424" x2="424" y1="350" y2="350"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="879" x2="879" y1="350" y2="362"/>
+<line clip-path="url(#clipPath18)" fill="none" x1="879" x2="892" y1="362" y2="362"/>
+<rect x="244" y="458" clip-path="url(#clipPath19)" fill="url(#linearGradient6)" width="468" height="42" stroke="none"/>
+<text xml:space="preserve" x="250" y="476" clip-path="url(#clipPath20)" stroke="none">Data Flow oriented communication: consumer data actively by calling</text>
+<text xml:space="preserve" x="250" y="491" clip-path="url(#clipPath20)" stroke="none">the required poll operation </text>
+<line clip-path="url(#clipPath21)" fill="none" x1="244" x2="699" y1="458" y2="458"/>
+<line clip-path="url(#clipPath21)" fill="none" x1="699" x2="711" y1="458" y2="470"/>
+<line clip-path="url(#clipPath21)" fill="none" x1="711" x2="711" y1="470" y2="499"/>
+<line clip-path="url(#clipPath21)" fill="none" x1="711" x2="244" y1="499" y2="499"/>
+<line clip-path="url(#clipPath21)" fill="none" x1="244" x2="244" y1="499" y2="458"/>
+<line clip-path="url(#clipPath21)" fill="none" x1="244" x2="244" y1="458" y2="458"/>
+<line clip-path="url(#clipPath21)" fill="none" x1="699" x2="699" y1="458" y2="470"/>
+<line clip-path="url(#clipPath21)" fill="none" x1="699" x2="712" y1="470" y2="470"/>
+<rect x="10" y="566" clip-path="url(#clipPath22)" fill="url(#linearGradient7)" width="595" height="42" stroke="none"/>
+<text xml:space="preserve" x="16" y="584" clip-path="url(#clipPath23)" stroke="none">In order to support icons, all port kinds are stereotypes, but for Qompass they are classes</text>
+<text xml:space="preserve" x="16" y="599" clip-path="url(#clipPath23)" stroke="none">stereotyped as "PortKind"</text>
+<line clip-path="url(#clipPath24)" fill="none" x1="10" x2="592" y1="566" y2="566"/>
+<line clip-path="url(#clipPath24)" fill="none" x1="592" x2="604" y1="566" y2="578"/>
+<line clip-path="url(#clipPath24)" fill="none" x1="604" x2="604" y1="578" y2="607"/>
+<line clip-path="url(#clipPath24)" fill="none" x1="604" x2="10" y1="607" y2="607"/>
+<line clip-path="url(#clipPath24)" fill="none" x1="10" x2="10" y1="607" y2="566"/>
+<line clip-path="url(#clipPath24)" fill="none" x1="10" x2="10" y1="566" y2="566"/>
+<line clip-path="url(#clipPath24)" fill="none" x1="592" x2="592" y1="566" y2="578"/>
+<line clip-path="url(#clipPath24)" fill="none" x1="592" x2="605" y1="578" y2="578"/>
+<rect x="46" y="512" clip-path="url(#clipPath25)" fill="url(#linearGradient8)" width="127" height="37" stroke="none"/>
+<text xml:space="preserve" x="77" y="527" clip-path="url(#clipPath26)" stroke="none">«PortKind»</text>
+<text xml:space="preserve" x="54" y="543" clip-path="url(#clipPath27)" stroke="none">PushProdPullCons</text>
+<rect x="46" y="512" clip-path="url(#clipPath28)" fill="none" width="126" rx="0" ry="0" height="36"/>
+<rect x="244" y="512" clip-path="url(#clipPath29)" fill="url(#linearGradient9)" width="469" height="42" stroke="none"/>
+<text xml:space="preserve" x="250" y="530" clip-path="url(#clipPath30)" stroke="none"> A bidirectional flow port combining a push-producer and a pull</text>
+<text xml:space="preserve" x="250" y="545" clip-path="url(#clipPath30)" stroke="none">consumer</text>
+<line clip-path="url(#clipPath31)" fill="none" x1="244" x2="700" y1="512" y2="512"/>
+<line clip-path="url(#clipPath31)" fill="none" x1="700" x2="712" y1="512" y2="524"/>
+<line clip-path="url(#clipPath31)" fill="none" x1="712" x2="712" y1="524" y2="553"/>
+<line clip-path="url(#clipPath31)" fill="none" x1="712" x2="244" y1="553" y2="553"/>
+<line clip-path="url(#clipPath31)" fill="none" x1="244" x2="244" y1="553" y2="512"/>
+<line clip-path="url(#clipPath31)" fill="none" x1="244" x2="244" y1="512" y2="512"/>
+<line clip-path="url(#clipPath31)" fill="none" x1="700" x2="700" y1="512" y2="524"/>
+<line clip-path="url(#clipPath31)" fill="none" x1="700" x2="713" y1="524" y2="524"/>
+<rect x="13" y="625" clip-path="url(#clipPath32)" fill="url(#linearGradient10)" width="224" height="61" stroke="none"/>
+<text xml:space="preserve" x="90" y="640" clip-path="url(#clipPath33)" stroke="none">«Interface»</text>
+<image x="14" y="644" clip-path="url(#clipPath34)" width="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR42mNkgIKC&#10;BUf+P3jyCchiBOL/QMgIYTFCREDg/38GOFCU4WWYkGDDyAITuP/4E8OkNDsGYkHu&#10;rINgGm7Av7//GNjZmMHsEzceMVhoyDFYVK6EazjRHg4Xh2iAOIcJ2VQWZiawooKF&#10;x8HsM12RYHEQDeKDxEHyIDYMoBnACFZ0oTcKzAZhmDgIg8QhhjNiN4AVaPKEeEsG&#10;g+JlYDYr1CYYGyQOkmfF6gJgELMCTfYyUYEqYmTQLlgClgLRID5IHCQPYv+DhgEL&#10;Qv8/BmYmiNN8zVTB9N2pcSghDxOHqEczAAT8GjaB08F/NBIGECkEyGZkxDRgaYUX&#10;0ekgpnM7ZiCSA1iwmUq2AUvKPQfQCypKwiR5AaSeKgAABcZdRqE6GaQAAAAASUVO&#10;RK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="16" preserveAspectRatio="none" xlink:show="embed"/>
+<text xml:space="preserve" x="33" y="656" clip-path="url(#clipPath35)" stroke="none">Please update derived elements</text>
+<line clip-path="url(#clipPath36)" fill="none" x1="13" x2="237" y1="661" y2="661"/>
+<rect x="13" y="625" clip-path="url(#clipPath37)" fill="none" width="223" rx="0" ry="0" height="60"/>
+<rect x="297" y="628" clip-path="url(#clipPath38)" fill="url(#linearGradient11)" width="315" height="71" stroke="none"/>
+<text xml:space="preserve" x="303" y="646" clip-path="url(#clipPath39)" stroke="none">Dummy interface returned by ports who need</text>
+<text xml:space="preserve" x="303" y="661" clip-path="url(#clipPath39)" stroke="none">to update derived interfaces (but can only do</text>
+<text xml:space="preserve" x="303" y="676" clip-path="url(#clipPath39)" stroke="none">so in the context of a transaction).</text>
+<line clip-path="url(#clipPath40)" fill="none" x1="297" x2="599" y1="628" y2="628"/>
+<line clip-path="url(#clipPath40)" fill="none" x1="599" x2="611" y1="628" y2="640"/>
+<line clip-path="url(#clipPath40)" fill="none" x1="611" x2="611" y1="640" y2="698"/>
+<line clip-path="url(#clipPath40)" fill="none" x1="611" x2="297" y1="698" y2="698"/>
+<line clip-path="url(#clipPath40)" fill="none" x1="297" x2="297" y1="698" y2="628"/>
+<line clip-path="url(#clipPath40)" fill="none" x1="297" x2="297" y1="628" y2="628"/>
+<line clip-path="url(#clipPath40)" fill="none" x1="599" x2="599" y1="628" y2="640"/>
+<line clip-path="url(#clipPath40)" fill="none" x1="599" x2="612" y1="640" y2="640"/>
+<rect x="32" y="30" clip-path="url(#clipPath41)" fill="url(#linearGradient12)" width="1061" height="301" stroke="none"/>
+<line clip-path="url(#clipPath42)" fill="none" x1="32" x2="156" y1="30" y2="30"/>
+<line clip-path="url(#clipPath42)" fill="none" x1="156" x2="156" y1="30" y2="52"/>
+<line clip-path="url(#clipPath42)" fill="none" x1="156" x2="1093" y1="52" y2="52"/>
+<line clip-path="url(#clipPath42)" fill="none" x1="1093" x2="1093" y1="52" y2="331"/>
+<line clip-path="url(#clipPath42)" fill="none" x1="1093" x2="32" y1="331" y2="331"/>
+<line clip-path="url(#clipPath42)" fill="none" x1="32" x2="32" y1="331" y2="30"/>
+<image x="37" y="33" clip-path="url(#clipPath43)" width="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAWUlEQVR42mNgGPKA&#10;EUQoZCz4j0vBgxkJjPgMYIEx7k+Px5BUzFxIuQvwAZDr4C7YUBdAkuaApg2oXgAB&#10;MV5+kl3BRGksoLiAnZlCA5gZKTWAiQIDYKE6AgEAAu0P6M4KKrgAAAAASUVORK5C&#10;YII=" xlink:type="simple" xlink:actuate="onLoad" height="16" preserveAspectRatio="none" xlink:show="embed"/>
+<text xml:space="preserve" x="56" y="45" clip-path="url(#clipPath44)" stroke="none">interfaceBased</text>
+<rect x="272" y="70" clip-path="url(#clipPath45)" fill="url(#linearGradient13)" width="127" height="37" stroke="none"/>
+<text xml:space="preserve" x="303" y="85" clip-path="url(#clipPath46)" stroke="none">«PortKind»</text>
+<text xml:space="preserve" x="285" y="101" clip-path="url(#clipPath47)" stroke="none">ProvideInterface</text>
+<rect x="272" y="70" clip-path="url(#clipPath48)" fill="none" width="126" rx="0" ry="0" height="36"/>
+<rect x="272" y="130" clip-path="url(#clipPath49)" fill="url(#linearGradient14)" width="127" height="37" stroke="none"/>
+<text xml:space="preserve" x="303" y="145" clip-path="url(#clipPath50)" stroke="none">«PortKind»</text>
+<text xml:space="preserve" x="296" y="161" clip-path="url(#clipPath51)" stroke="none">UseInterface</text>
+<rect x="272" y="130" clip-path="url(#clipPath52)" fill="none" width="126" rx="0" ry="0" height="36"/>
+<rect x="272" y="190" clip-path="url(#clipPath53)" fill="url(#linearGradient15)" width="127" height="37" stroke="none"/>
+<text xml:space="preserve" x="303" y="205" clip-path="url(#clipPath54)" stroke="none">«PortKind»</text>
+<text xml:space="preserve" x="315" y="221" clip-path="url(#clipPath55)" stroke="none">AMIpoll</text>
+<rect x="272" y="190" clip-path="url(#clipPath56)" fill="none" width="126" rx="0" ry="0" height="36"/>
+<rect x="272" y="250" clip-path="url(#clipPath57)" fill="url(#linearGradient16)" width="127" height="37" stroke="none"/>
+<text xml:space="preserve" x="303" y="265" clip-path="url(#clipPath58)" stroke="none">«PortKind»</text>
+<text xml:space="preserve" x="300" y="281" clip-path="url(#clipPath59)" stroke="none">AMIcallback</text>
+<rect x="272" y="250" clip-path="url(#clipPath60)" fill="none" width="126" rx="0" ry="0" height="36"/>
+<rect x="472" y="70" clip-path="url(#clipPath61)" fill="url(#linearGradient17)" width="469" height="40" stroke="none"/>
+<text xml:space="preserve" x="478" y="88" clip-path="url(#clipPath62)" stroke="none">Simple provision of typing interface as provided interface</text>
+<line clip-path="url(#clipPath63)" fill="none" x1="472" x2="928" y1="70" y2="70"/>
+<line clip-path="url(#clipPath63)" fill="none" x1="928" x2="940" y1="70" y2="82"/>
+<line clip-path="url(#clipPath63)" fill="none" x1="940" x2="940" y1="82" y2="109"/>
+<line clip-path="url(#clipPath63)" fill="none" x1="940" x2="472" y1="109" y2="109"/>
+<line clip-path="url(#clipPath63)" fill="none" x1="472" x2="472" y1="109" y2="70"/>
+<line clip-path="url(#clipPath63)" fill="none" x1="472" x2="472" y1="70" y2="70"/>
+<line clip-path="url(#clipPath63)" fill="none" x1="928" x2="928" y1="70" y2="82"/>
+<line clip-path="url(#clipPath63)" fill="none" x1="928" x2="941" y1="82" y2="82"/>
+<rect x="472" y="130" clip-path="url(#clipPath64)" fill="url(#linearGradient18)" width="469" height="35" stroke="none"/>
+<text xml:space="preserve" x="478" y="148" clip-path="url(#clipPath65)" stroke="none">Simple provision of typing interface as required interface</text>
+<line clip-path="url(#clipPath66)" fill="none" x1="472" x2="928" y1="130" y2="130"/>
+<line clip-path="url(#clipPath66)" fill="none" x1="928" x2="940" y1="130" y2="142"/>
+<line clip-path="url(#clipPath66)" fill="none" x1="940" x2="940" y1="142" y2="164"/>
+<line clip-path="url(#clipPath66)" fill="none" x1="940" x2="472" y1="164" y2="164"/>
+<line clip-path="url(#clipPath66)" fill="none" x1="472" x2="472" y1="164" y2="130"/>
+<line clip-path="url(#clipPath66)" fill="none" x1="472" x2="472" y1="130" y2="130"/>
+<line clip-path="url(#clipPath66)" fill="none" x1="928" x2="928" y1="130" y2="142"/>
+<line clip-path="url(#clipPath66)" fill="none" x1="928" x2="941" y1="142" y2="142"/>
+<rect x="472" y="190" clip-path="url(#clipPath67)" fill="url(#linearGradient19)" width="469" height="42" stroke="none"/>
+<text xml:space="preserve" x="478" y="208" clip-path="url(#clipPath68)" stroke="none">CORBA asynchronous messaging (AMI): Provision of poller variant of</text>
+<text xml:space="preserve" x="478" y="223" clip-path="url(#clipPath68)" stroke="none">typing interface. Allows client to continue without waiting for the result</text>
+<line clip-path="url(#clipPath69)" fill="none" x1="472" x2="928" y1="190" y2="190"/>
+<line clip-path="url(#clipPath69)" fill="none" x1="928" x2="940" y1="190" y2="202"/>
+<line clip-path="url(#clipPath69)" fill="none" x1="940" x2="940" y1="202" y2="231"/>
+<line clip-path="url(#clipPath69)" fill="none" x1="940" x2="472" y1="231" y2="231"/>
+<line clip-path="url(#clipPath69)" fill="none" x1="472" x2="472" y1="231" y2="190"/>
+<line clip-path="url(#clipPath69)" fill="none" x1="472" x2="472" y1="190" y2="190"/>
+<line clip-path="url(#clipPath69)" fill="none" x1="928" x2="928" y1="190" y2="202"/>
+<line clip-path="url(#clipPath69)" fill="none" x1="928" x2="941" y1="202" y2="202"/>
+<rect x="472" y="250" clip-path="url(#clipPath70)" fill="url(#linearGradient20)" width="469" height="57" stroke="none"/>
+<text xml:space="preserve" x="478" y="268" clip-path="url(#clipPath71)" stroke="none">CORBA asynchronous messaging (AMI): Provision of callback variant of</text>
+<text xml:space="preserve" x="478" y="283" clip-path="url(#clipPath71)" stroke="none">typing interface. Allows client Allows client to continue without waiting</text>
+<text xml:space="preserve" x="478" y="298" clip-path="url(#clipPath71)" stroke="none">for the result</text>
+<line clip-path="url(#clipPath72)" fill="none" x1="472" x2="928" y1="250" y2="250"/>
+<line clip-path="url(#clipPath72)" fill="none" x1="928" x2="940" y1="250" y2="262"/>
+<line clip-path="url(#clipPath72)" fill="none" x1="940" x2="940" y1="262" y2="306"/>
+<line clip-path="url(#clipPath72)" fill="none" x1="940" x2="472" y1="306" y2="306"/>
+<line clip-path="url(#clipPath72)" fill="none" x1="472" x2="472" y1="306" y2="250"/>
+<line clip-path="url(#clipPath72)" fill="none" x1="472" x2="472" y1="250" y2="250"/>
+<line clip-path="url(#clipPath72)" fill="none" x1="928" x2="928" y1="250" y2="262"/>
+<line clip-path="url(#clipPath72)" fill="none" x1="928" x2="941" y1="262" y2="262"/>
+<rect x="52" y="70" clip-path="url(#clipPath73)" fill="url(#linearGradient21)" width="121" height="101" stroke="none"/>
+<text xml:space="preserve" x="78" y="117" clip-path="url(#clipPath74)" stroke="none">«Interface»</text>
+<image x="102" y="121" clip-path="url(#clipPath75)" width="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR42mNkgIKC&#10;BUf+P3jyCchiBOL/QMgIYTFCREDg/38GOFCU4WWYkGDDyAITuP/4E8OkNDsGYkHu&#10;rINgGm7Av7//GNjZmMHsEzceMVhoyDFYVK6EazjRHg4Xh2iAOIcJ2VQWZiawooKF&#10;x8HsM12RYHEQDeKDxEHyIDYMoBnACFZ0oTcKzAZhmDgIg8QhhjNiN4AVaPKEeEsG&#10;g+JlYDYr1CYYGyQOkmfF6gJgELMCTfYyUYEqYmTQLlgClgLRID5IHCQPYv+DhgEL&#10;Qv8/BmYmiNN8zVTB9N2pcSghDxOHqEczAAT8GjaB08F/NBIGECkEyGZkxDRgaYUX&#10;0ekgpnM7ZiCSA1iwmUq2AUvKPQfQCypKwiR5AaSeKgAABcZdRqE6GaQAAAAASUVO&#10;RK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="16" preserveAspectRatio="none" xlink:show="embed"/>
+<text xml:space="preserve" x="121" y="133" clip-path="url(#clipPath76)" stroke="none">I</text>
+<rect x="52" y="70" clip-path="url(#clipPath77)" fill="none" width="120" rx="0" ry="0" height="100"/>
+<line clip-path="url(#clipPath78)" fill="none" x1="32" x2="1093" y1="52" y2="52"/>
+<rect x="1040" y="10" clip-path="url(#clipPath79)" fill="rgb(195,209,213)" width="87" height="40" stroke="none"/>
+<text xml:space="preserve" x="1045" y="24" clip-path="url(#clipPath80)" stroke="none">I: Interface</text>
+<line clip-path="url(#clipPath81)" fill="none" x1="1040" x2="1123" y1="10" y2="10" stroke="red"/>
+<rect x="1040" y="10" clip-path="url(#clipPath79)" fill="none" width="86" height="39"/>
+<polygon clip-path="url(#clipPath82)" points=" 1126 13 1126 49 1043 49 1043 52 1129 52 1129 13 1126 13" stroke="none"/>
+<line clip-path="url(#clipPath83)" fill="none" text-rendering="optimizeLegibility" x1="472" x2="399" y1="88" y2="88" stroke-dasharray="6.6,3.3"/>
+<line clip-path="url(#clipPath83)" fill="none" text-rendering="optimizeLegibility" x1="472" x2="399" y1="267" y2="267" stroke-dasharray="6.6,3.3"/>
+<line clip-path="url(#clipPath83)" fill="none" text-rendering="optimizeLegibility" x1="472" x2="399" y1="152" y2="152" stroke-dasharray="6.6,3.3"/>
+<line clip-path="url(#clipPath83)" fill="none" text-rendering="optimizeLegibility" x1="272" x2="173" y1="150" y2="150" stroke-dasharray="5,5,5,5,5,5,5,5,5,5"/>
+<text x="211" y="95" clip-path="url(#clipPath84)" text-rendering="optimizeLegibility" stroke-dasharray="5,5,5,5,5,5,5,5,5,5" stroke="none" xml:space="preserve">use</text>
+<line clip-path="url(#clipPath85)" fill="none" text-rendering="optimizeLegibility" x1="188" x2="173" y1="145" y2="150"/>
+<line clip-path="url(#clipPath85)" fill="none" text-rendering="optimizeLegibility" x1="173" x2="188" y1="150" y2="155"/>
+<line clip-path="url(#clipPath83)" fill="none" text-rendering="optimizeLegibility" x1="272" x2="173" y1="90" y2="90" stroke-dasharray="5,5,5,5,5,5,5,5,5,5"/>
+</g>
+<g stroke-linecap="butt" fill="white" text-rendering="optimizeLegibility" stroke-dasharray="5,5,5,5,5,5,5,5,5,5" stroke="white" stroke-width="1.1">
+<polygon clip-path="url(#clipPath86)" points=" 173 90 188 85 188 95" stroke="none"/>
+<polygon fill="none" stroke-dasharray="none" clip-path="url(#clipPath86)" points=" 173 90 188 85 188 95" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="472" x2="399" y1="208" y2="208" stroke-dasharray="6.6,3.3" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="472" x2="399" y1="88" y2="88" stroke-dasharray="6.6,3.3" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="472" x2="399" y1="152" y2="152" stroke-dasharray="6.6,3.3" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="472" x2="399" y1="208" y2="208" stroke-dasharray="6.6,3.3" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="472" x2="399" y1="267" y2="267" stroke-dasharray="6.6,3.3" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="245" x2="173" y1="426" y2="423" stroke-dasharray="6.6,3.3" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="424" x2="353" y1="369" y2="369" stroke-dasharray="6.6,3.3" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="244" x2="173" y1="476" y2="475" stroke-dasharray="6.6,3.3" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="244" x2="173" y1="527" y2="529" stroke-dasharray="6.6,3.3" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="297" x2="237" y1="655" y2="653" stroke-dasharray="6.6,3.3" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="272" x2="173" y1="90" y2="90" stroke="black"/>
+<polygon clip-path="url(#clipPath86)" points=" 173 90 188 85 188 95" stroke="none"/>
+<polygon fill="none" stroke-dasharray="none" clip-path="url(#clipPath86)" points=" 173 90 188 85 188 95" stroke="black"/>
+<line clip-path="url(#clipPath83)" fill="none" x1="272" x2="173" y1="150" y2="150" stroke="black"/>
+<text x="211" y="95" clip-path="url(#clipPath84)" fill="black" stroke="none" xml:space="preserve">use</text>
+<line clip-path="url(#clipPath85)" fill="none" x1="188" x2="173" y1="145" y2="150" stroke-dasharray="none" stroke="black"/>
+<line clip-path="url(#clipPath85)" fill="none" x1="173" x2="188" y1="150" y2="155" stroke-dasharray="none" stroke="black"/>
+</g>
+</g>
+</svg>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.di
index a91f94ef62c..a91f94ef62c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.notation
index 8686e2eff0d..8686e2eff0d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.uml
index f5f50bfcf69..f5f50bfcf69 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di
index 6432ab900ff..6432ab900ff 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation
index 66345951ba3..66345951ba3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml
index af9181b76ac..af9181b76ac 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.di
index dbd0aabd9ce..dbd0aabd9ce 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.notation
index 0122891b2b9..0122891b2b9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.uml
index 35fb7fa4914..35fb7fa4914 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/sysinterfaces.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.di
index 61f9c2fac17..61f9c2fac17 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.notation
index 989a0923956..989a0923956 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.uml
index aec9cff4984..aec9cff4984 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassModel.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.di b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.di
index 9ff5520aae6..9ff5520aae6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.di
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.di
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.notation b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.notation
index 57b432f3a65..57b432f3a65 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.notation
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.notation
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.uml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.uml
index b90cad4bdad..b90cad4bdad 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.uml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/models/wizardTemplates/QompassSimple.uml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.properties b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.properties
index 2e655ccb549..2e655ccb549 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.properties
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml
index ed77d369a14..ed77d369a14 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/pom.xml b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/pom.xml
index 36f46641d87..e44092312e0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/pom.xml
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/pom.xml
@@ -5,7 +5,7 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
+		<relativePath>../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.modellibs.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/Activator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/Activator.java
index 8859e978d40..8859e978d40 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/Activator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/Activator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/HelloWorldModelWizard.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/HelloWorldModelWizard.java
index 5972200b5ff..5972200b5ff 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/HelloWorldModelWizard.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/HelloWorldModelWizard.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/ProducerConsumerModelWizard.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/ProducerConsumerModelWizard.java
index 38ae39a4204..38ae39a4204 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/ProducerConsumerModelWizard.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/ProducerConsumerModelWizard.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindCppIncludeToFirstActual.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindCppIncludeToFirstActual.java
index a8e25cbbf12..a8e25cbbf12 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindCppIncludeToFirstActual.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindCppIncludeToFirstActual.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindOperation.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindOperation.java
index 6b2d352e1ee..6b2d352e1ee 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindOperation.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindOperation.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/InstantiateCppIncludeWithItSelf.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/InstantiateCppIncludeWithItSelf.java
index cd4a730ee30..cd4a730ee30 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/InstantiateCppIncludeWithItSelf.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/InstantiateCppIncludeWithItSelf.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java
index 996363af3dd..996363af3dd 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/embeddingrules/AccordCall.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/embeddingrules/AccordCall.java
index e76e284f645..e76e284f645 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/embeddingrules/AccordCall.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/embeddingrules/AccordCall.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/AnimServiceConfigurator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/AnimServiceConfigurator.java
index b33d4053ed2..b33d4053ed2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/AnimServiceConfigurator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/AnimServiceConfigurator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/CallEventConfigurator.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/CallEventConfigurator.java
index db9831cd43a..db9831cd43a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/CallEventConfigurator.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/CallEventConfigurator.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIcallback.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIcallback.java
index 74809d9cc9b..74809d9cc9b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIcallback.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIcallback.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIpoll.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIpoll.java
index 220f2021465..220f2021465 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIpoll.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIpoll.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java
index 3d08ffae8bf..3d08ffae8bf 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort2.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort2.java
index f12eadcdc4c..f12eadcdc4c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort2.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort2.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ProvideInterface.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ProvideInterface.java
index 2432ddcdc42..2432ddcdc42 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ProvideInterface.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ProvideInterface.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java
index 84c73d33c96..84c73d33c96 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushConsumer.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushConsumer.java
index f0375f8840e..f0375f8840e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushConsumer.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushConsumer.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProdPullCons.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProdPullCons.java
index d719977a2db..d719977a2db 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProdPullCons.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProdPullCons.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProducer.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProducer.java
index e7933346b8f..e7933346b8f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProducer.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProducer.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
index 62dce7e7709..62dce7e7709 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/UseConjIntf.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/UseConjIntf.java
index cee9f055d01..cee9f055d01 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/UseConjIntf.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/UseConjIntf.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/UseInterface.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/UseInterface.java
index 26af9111517..26af9111517 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/UseInterface.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/UseInterface.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/AMIPull.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/AMIPull.xtend
index d1e1fb28303..d1e1fb28303 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/AMIPull.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/AMIPull.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/AsyncCalls.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/AsyncCalls.xtend
index fa7cb846212..fa7cb846212 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/AsyncCalls.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/AsyncCalls.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/BehaviorUtil.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/BehaviorUtil.java
index e815c2c332b..e815c2c332b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/BehaviorUtil.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/BehaviorUtil.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/CppUtils.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/CppUtils.xtend
index fb028cc5f16..fb028cc5f16 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/CppUtils.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/CppUtils.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/FIFO.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/FIFO.xtend
index 59440deec7b..59440deec7b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/FIFO.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/FIFO.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/GlobalConstants.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/GlobalConstants.xtend
index b2a19cce408..b2a19cce408 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/GlobalConstants.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/GlobalConstants.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/Marshalling.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/Marshalling.xtend
index 02d93031b6a..02d93031b6a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/Marshalling.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/Marshalling.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/MultipleReceptacle.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/MultipleReceptacle.xtend
index 0f73ff273e2..0f73ff273e2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/MultipleReceptacle.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/MultipleReceptacle.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineGen.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineGen.xtend
index 310526b1998..310526b1998 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineGen.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineGen.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineUtil.java b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineUtil.java
index d33d2a0c9fb..d33d2a0c9fb 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineUtil.java
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineUtil.java
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StructBasedMarshalling.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StructBasedMarshalling.xtend
index 89d085b3937..89d085b3937 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StructBasedMarshalling.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StructBasedMarshalling.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/SyncCalls.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/SyncCalls.xtend
index 96952f2f8d1..96952f2f8d1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/SyncCalls.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/SyncCalls.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLAction.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLAction.xtend
index 3cbc6f2da3a..3cbc6f2da3a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLAction.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLAction.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLChain.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLChain.xtend
index 05bf596b9a6..05bf596b9a6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLChain.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLChain.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLFlatModel2Cpp.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLFlatModel2Cpp.xtend
index fe1b522e4bf..fe1b522e4bf 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLFlatModel2Cpp.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLFlatModel2Cpp.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLFlattener.xtend b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLFlattener.xtend
index 002469ae5b0..002469ae5b0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLFlattener.xtend
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/UMLFlattener.xtend
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/xtend-gen/.gitignore b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/xtend-gen/.gitignore
index c96a04f008e..c96a04f008e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/xtend-gen/.gitignore
+++ b/extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core/xtend-gen/.gitignore
diff --git a/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/.project b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/.project
new file mode 100644
index 00000000000..0e99cc63a9e
--- /dev/null
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.services.tracebreakpoints.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/.project b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/.project
new file mode 100644
index 00000000000..be89f0cf7f2
--- /dev/null
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.services.tracebreakpoints</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.classpath b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.classpath
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.classpath
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.project b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.project
index 07350fea43f..07350fea43f 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.project
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.project
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.settings/org.eclipse.jdt.core.prefs
index f42de363afa..f42de363afa 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF
index 36e9fe9b7ba..36e9fe9b7ba 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/about.html b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/about.html
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/about.html
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/build.properties b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/build.properties
index 8e1f07ccf86..8e1f07ccf86 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/build.properties
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/build.properties
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_16x16.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_16x16.gif
index a831fe72782..a831fe72782 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_16x16.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_16x16.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_9x9.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_9x9.gif
index 3678b09c6bf..3678b09c6bf 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_9x9.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_9x9.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_grp.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_grp.gif
index 173661c5df7..173661c5df7 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_grp.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_grp.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_grp_disabled.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_grp_disabled.gif
index 5ea466bcb2a..5ea466bcb2a 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_grp_disabled.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkp_grp_disabled.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkpd_16x16.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkpd_16x16.gif
index 74b26c31a4d..74b26c31a4d 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkpd_16x16.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkpd_16x16.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkpd_9x9.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkpd_9x9.gif
index d6d8d31b06f..d6d8d31b06f 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkpd_9x9.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/brkpd_9x9.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/debug.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/debug.gif
index d90a29fead8..d90a29fead8 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/debug.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/debug.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/properties.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/properties.gif
index 1dc19a31a0f..1dc19a31a0f 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/properties.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/properties.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcp_11x12.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcp_11x12.gif
index c04edf8e83e..c04edf8e83e 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcp_11x12.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcp_11x12.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcp_16x16.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcp_16x16.gif
index 29ec606076f..29ec606076f 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcp_16x16.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcp_16x16.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcpd_11x12.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcpd_11x12.gif
index f3e7b3d6791..f3e7b3d6791 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcpd_11x12.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcpd_11x12.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcpd_16x16.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcpd_16x16.gif
index 76c65b6196f..76c65b6196f 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcpd_16x16.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/icons/etool16/trcpd_16x16.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/plugin.properties b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/plugin.properties
index 3cabfa42274..3cabfa42274 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/plugin.properties
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/plugin.properties
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/plugin.xml b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/plugin.xml
index 80dceda93de..80dceda93de 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/plugin.xml
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/plugin.xml
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/pom.xml b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/pom.xml
index 543d8bee3aa..5c3b2b2129a 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/pom.xml
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.tracepoints</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/schema/traceMechanism.exsd b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/schema/traceMechanism.exsd
index ba8ed1aca6d..ba8ed1aca6d 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/schema/traceMechanism.exsd
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/schema/traceMechanism.exsd
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Activator.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Activator.java
index 8054e407ef6..8054e407ef6 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Activator.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Activator.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/ITraceMechanism.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/ITraceMechanism.java
index 17ef8dd24f1..17ef8dd24f1 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/ITraceMechanism.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/ITraceMechanism.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/MarkerUtils.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/MarkerUtils.java
index a96b35d64f2..a96b35d64f2 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/MarkerUtils.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/MarkerUtils.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Messages.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Messages.java
index 3db820e80cb..3db820e80cb 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Messages.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Messages.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java
index 9935817b45b..9935817b45b 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java
index a0a62b30f80..a0a62b30f80 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java
index 3d64bbdc4bb..3d64bbdc4bb 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceState.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceState.java
index f6e98d06d71..f6e98d06d71 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceState.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceState.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java
index 2246147467b..2246147467b 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java
index aaece766bed..aaece766bed 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java
index 5fc0cce53ae..5fc0cce53ae 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java
index f5d0b1df3aa..f5d0b1df3aa 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java
index 60d3fc81eb4..60d3fc81eb4 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java
index f1353a264e0..f1353a264e0 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java
index c61c0834ce1..c61c0834ce1 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java
index ce47f430c72..ce47f430c72 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/AbstractCommandHandler.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/AbstractCommandHandler.java
index 5f4c6281690..5f4c6281690 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/AbstractCommandHandler.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/AbstractCommandHandler.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleBreakpointActivationHandler.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleBreakpointActivationHandler.java
index 2d79fc944ac..2d79fc944ac 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleBreakpointActivationHandler.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleBreakpointActivationHandler.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleBreakpointHandler.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleBreakpointHandler.java
index 30a64d1f7aa..30a64d1f7aa 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleBreakpointHandler.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleBreakpointHandler.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleTracepointActivationHandler.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleTracepointActivationHandler.java
index 778ff6f23ba..778ff6f23ba 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleTracepointActivationHandler.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleTracepointActivationHandler.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleTracepointHandler.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleTracepointHandler.java
index b1334b8f784..b1334b8f784 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleTracepointHandler.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/ToggleTracepointHandler.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/TracepointPropertiesHandler.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/TracepointPropertiesHandler.java
index b191d9bb6c4..b191d9bb6c4 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/TracepointPropertiesHandler.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/handler/TracepointPropertiesHandler.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/messages.properties b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/messages.properties
index 94ce99780de..94ce99780de 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/messages.properties
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/messages.properties
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java
index f0889b96393..f0889b96393 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/MultipleChoiceFieldEditor.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/MultipleChoiceFieldEditor.java
index 2bd41aadfa5..2bd41aadfa5 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/MultipleChoiceFieldEditor.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/MultipleChoiceFieldEditor.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java
index 805ae8a3b87..805ae8a3b87 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java
index 4280caa8c4e..4280caa8c4e 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java
index eb4008a2308..eb4008a2308 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.classpath b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.classpath
index 248b4c5dc7a..248b4c5dc7a 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.classpath
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.classpath
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.gitignore b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.gitignore
index 5500bf75774..5500bf75774 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.gitignore
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.gitignore
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.project b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.project
index e5477bc69be..e5477bc69be 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.project
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.project
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.settings/org.eclipse.jdt.core.prefs
index f42de363afa..f42de363afa 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
index 6908c801140..6908c801140 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/about.html b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/about.html
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/about.html
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
index 9ce34a99746..9ce34a99746 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.properties b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.properties
index a9d7f6eeed9..a9d7f6eeed9 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.properties
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.properties
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/help/tocconcepts.xml b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/help/tocconcepts.xml
index 0344ca208f3..0344ca208f3 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/help/tocconcepts.xml
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/help/tocconcepts.xml
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image001.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image001.gif
index 5271b605b82..5271b605b82 100755
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image001.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image001.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image002.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image002.gif
index d82c319e550..d82c319e550 100755
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image002.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image002.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image003.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image003.gif
index fae2ca8952f..fae2ca8952f 100755
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image003.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image003.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image004.jpg b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image004.jpg
index 864120f480a..864120f480a 100755
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image004.jpg
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image004.jpg
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image005.jpg b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image005.jpg
index 9c9d1935d00..9c9d1935d00 100755
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image005.jpg
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image005.jpg
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image006.jpg b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image006.jpg
index d732917a0fc..d732917a0fc 100755
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image006.jpg
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image006.jpg
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image007.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image007.gif
index 2a26c4ddaa7..2a26c4ddaa7 100755
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image007.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image007.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image008.jpg b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image008.jpg
index a332638c7e5..a332638c7e5 100755
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image008.jpg
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image008.jpg
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image009.jpg b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image009.jpg
index bb1eed8a3b3..bb1eed8a3b3 100755
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image009.jpg
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/images/image009.jpg
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/userguide.htm b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/userguide.htm
index b2f52da6ea1..b2f52da6ea1 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/userguide.htm
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/html/userguide.htm
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.di b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.di
index de6e71c6b4a..de6e71c6b4a 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.di
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.di
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.notation b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.notation
index 0a038c23221..0a038c23221 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.notation
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.notation
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml
index 58b4c73f332..58b4c73f332 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.di b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.di
index 8ead0589857..8ead0589857 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.di
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.di
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.notation b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.notation
index 8d26d0ae915..8d26d0ae915 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.notation
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.notation
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.uml b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.uml
index dec7c68c5a4..dec7c68c5a4 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.uml
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.uml
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.di b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.di
index 4b69336c601..4b69336c601 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.di
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.di
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.notation b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.notation
index 62727ee1920..62727ee1920 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.notation
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.notation
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.uml b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.uml
index 99e6bd2e3e9..99e6bd2e3e9 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.uml
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.uml
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.di b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.di
index ebdd073cf33..ebdd073cf33 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.di
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.di
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation
index f71f3401d51..f71f3401d51 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml
index 73635b6b22a..73635b6b22a 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.properties b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.properties
index 3909dafe6fc..3909dafe6fc 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.properties
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.properties
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml
index 7a1427bd9c9..7a1427bd9c9 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/pom.xml b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/pom.xml
index 631e12913d8..26d9859be7e 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/pom.xml
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/pom.xml
@@ -5,7 +5,7 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.modellibs.tracing</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/Activator.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/Activator.java
index bd40f7d0f5b..bd40f7d0f5b 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/Activator.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/Activator.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java
index ad9530592fc..ad9530592fc 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java
index 64cdef2bc3c..64cdef2bc3c 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java
index 4f7eaaf41d6..4f7eaaf41d6 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
index 8e286a6792e..8e286a6792e 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/StringConstants.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/StringConstants.java
index d3ced2536a6..d3ced2536a6 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/StringConstants.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/StringConstants.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceCout.xtend b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceCout.xtend
index 396d9860fb6..396d9860fb6 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceCout.xtend
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceCout.xtend
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceLTTng.xtend b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceLTTng.xtend
index be837094ae1..be837094ae1 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceLTTng.xtend
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceLTTng.xtend
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceOTF.xtend b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceOTF.xtend
index 39d65986c6a..39d65986c6a 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceOTF.xtend
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceOTF.xtend
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceUtils.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceUtils.java
index 7e20fb3019f..7e20fb3019f 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceUtils.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceUtils.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/xtend-gen/.gitignore b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/xtend-gen/.gitignore
index c96a04f008e..c96a04f008e 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/xtend-gen/.gitignore
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/xtend-gen/.gitignore
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.classpath b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.classpath
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/.classpath
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.project b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/.project
index 657d2f7a65c..657d2f7a65c 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.project
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/.project
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/.settings/org.eclipse.jdt.core.prefs
index f42de363afa..f42de363afa 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
index a5d9938325c..a5d9938325c 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
diff --git a/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/about.html b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/about.html
new file mode 100644
index 00000000000..209103075a7
--- /dev/null
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/about.html
@@ -0,0 +1,28 @@
+<!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>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>November 14, 2008</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content 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 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>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/build.properties b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/build.properties
index 379a4d0a4b0..379a4d0a4b0 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/build.properties
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/build.properties
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/breakpoint_view.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/breakpoint_view.gif
index f529c5a4225..f529c5a4225 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/breakpoint_view.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/breakpoint_view.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/gotoobj_tsk.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/gotoobj_tsk.gif
index cf62b63ae3e..cf62b63ae3e 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/gotoobj_tsk.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/gotoobj_tsk.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/skip_brkp.gif b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/skip_brkp.gif
index c1751c3ff4f..c1751c3ff4f 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/skip_brkp.gif
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/icons/skip_brkp.gif
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.properties b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.properties
index b02f21505bc..b02f21505bc 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.properties
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.properties
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.xml b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.xml
index 208df21df9f..208df21df9f 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.xml
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.xml
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/pom.xml b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/pom.xml
index dd166aa0d33..ca0d8d002fd 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/pom.xml
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/pom.xml
@@ -5,10 +5,10 @@
 		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/extra</relativePath>
+		<relativePath>../../../../../releng/extra</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.tracepoints</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/Activator.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/Activator.java
index 9be427595b3..9be427595b3 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/Activator.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/Activator.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TraceViewImages.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TraceViewImages.java
index 52e0379c5bd..52e0379c5bd 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TraceViewImages.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TraceViewImages.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java
index d628a81b917..d628a81b917 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.classpath b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.classpath
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/.classpath
diff --git a/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/.project b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/.project
new file mode 100644
index 00000000000..63174709d26
--- /dev/null
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.qompass.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..94d61f00da6
--- /dev/null
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/META-INF/MANIFEST.MF b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..950b3e10c67
--- /dev/null
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.uml2.uml;bundle-version="4.0.2",

+ org.eclipse.core.filesystem;bundle-version="1.3.200",

+ org.eclipse.core.resources;bundle-version="3.9.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

+ org.eclipse.emf.transaction;bundle-version="1.8.0"

+Export-Package: org.eclipse.papyrus.qompass.ui

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.2.0.qualifier

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.qompass.ui.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.qompass.ui;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/about.html b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/about.html
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/build.properties b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/build.properties
index 6c551f66003..6c551f66003 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/build.properties
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/build.properties
diff --git a/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/icons/qompass-16x16.gif b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/icons/qompass-16x16.gif
new file mode 100644
index 00000000000..c47d52ad211
--- /dev/null
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/icons/qompass-16x16.gif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/plugin.properties b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/plugin.properties
index 23bbbab2078..1e85d2491da 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/plugin.properties
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:

 #     CEA LIST - initial API and implementation

 ###############################################################################

-pluginName=Papyrus extra: Acceleo code generation UI support (Incubation)

+pluginName=Basic code-generation functions (Incubation)

 providerName=Eclipse Modeling Project

diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/plugin.xml b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/plugin.xml
index 10ffe8d6e48..02f515567bf 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/plugin.xml
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/plugin.xml
@@ -8,18 +8,22 @@
 		allPopups="true"
 		locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
 		<menu
-			icon="icons/codegen-16x16.gif"
-			id="org.eclipse.papyrus.views.modelexplorer.popup.codegen"
-			label="Code generation">
+			icon="icons/qompass-16x16.gif"
+			id="org.eclipse.papyrus.qompass.popup"
+			label="Qompass">
+			<separator name="designer" visible="true"/>
 		</menu>
 	</menuContribution>
 	<menuContribution
 		allPopups="true"
 		locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">
 		<menu
-			icon="icons/codegen-16x16.gif"
-			id="org.eclipse.papyrus.views.modelexplorer.popup.codegen"
-			label="Code generation">
+			icon="icons/qompass-16x16.gif"
+			id="org.eclipse.papyrus.qompass.popup"
+			label="Qompass">
+			<separator name="codegen" visible="true"/>
+			<separator name="designer" visible="true"/>
+			<separator name="architect" visible="true"/>
 		</menu>
 	</menuContribution>
 </extension>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/pom.xml b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/pom.xml
index 8668c069579..565d394a597 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/pom.xml
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/pom.xml
@@ -7,8 +7,8 @@
 		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../../releng/extra</relativePath>
 	</parent>
-	<artifactId>org.eclipse.papyrus.cpp.profile</artifactId>
+	<artifactId>org.eclipse.papyrus.qompass.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/src/org/eclipse/papyrus/qompass/ui/Activator.java b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/src/org/eclipse/papyrus/qompass/ui/Activator.java
new file mode 100644
index 00000000000..0ca60ed8fae
--- /dev/null
+++ b/extraplugins/qompass/org.eclipse.papyrus.qompass.ui/src/org/eclipse/papyrus/qompass/ui/Activator.java
@@ -0,0 +1,44 @@
+package org.eclipse.papyrus.qompass.ui;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator implements BundleActivator {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.qompass.ui"; //$NON-NLS-1$
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	public static LogHelper log;
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+		log = new LogHelper();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+		log = null;
+	}
+}
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/.project b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/.project
new file mode 100644
index 00000000000..0c0c76c63e7
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.extra.codegen.cpp.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/build.properties b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/build.properties
index cff2bd50c57..cff2bd50c57 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/build.properties
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/build.properties
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/epl-v10.html b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/epl-v10.html
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/epl-v10.html
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.properties b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/feature.properties
index 0defcd92ec8..0defcd92ec8 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.properties
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/feature.properties
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/feature.xml
new file mode 100644
index 00000000000..8ddae27aa42
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/feature.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.extra.codegen.cpp.feature"
+      label="%featureName"
+      version="1.2.0.qualifier"
+      provider-name="%providerName">
+
+   <description url="http://www.example.com/description">
+      C++ code generation from Papyrus. The feature includes
+- A C++ profile, enabling the specification for C++ features, for instance: pointers, friends, constructor initializers
+- A code generator from UML enriched with the C++ profile
+- A C++ view allowing simple editing of opaque behaviors and manipulation of C++ profile attributes
+- An experimental CDT integration
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2012 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>
+
+   <includes
+         id="org.eclipse.papyrus.extra.codegen.feature"
+         version="0.0.0"/>
+
+   <requires>
+      <import feature="org.eclipse.cdt" version="8.4.0.201406031009"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.codegen"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.codegen.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.profile.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.library"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.library.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.views.cpp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.texteditor.cdt"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.cdtproject"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.examples"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/license.html b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/license.html
index 0fd3dd13aac..0fd3dd13aac 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/license.html
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/license.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/pom.xml
index 49368638af9..b6266e92efe 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature/pom.xml
@@ -7,8 +7,8 @@
 		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../../releng/extra</relativePath>
 	</parent>
-	<artifactId>org.eclipse.papyrus.acceleo</artifactId>
+	<artifactId>org.eclipse.papyrus.extra.codegen.cpp.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+	<packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/.project b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/.project
index 8bcfc0d3202..ffde1a35948 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/.project
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.extra.cpp.feature</name>
+	<name>org.eclipse.papyrus.extra.codegen.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/build.properties b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/build.properties
new file mode 100644
index 00000000000..cff2bd50c57
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/build.properties
@@ -0,0 +1,6 @@
+bin.includes = feature.xml,\
+               epl-v10.html,\
+               license.html,\
+               feature.properties
+src.includes = epl-v10.html,\
+               license.html
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/epl-v10.html b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/epl-v10.html
new file mode 100644
index 00000000000..cb1073a4bad
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.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/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/feature.properties b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/feature.properties
new file mode 100644
index 00000000000..c4dc0e1e27f
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.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 base elements for code generation (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/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/feature.xml
new file mode 100644
index 00000000000..b296a9d4189
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/feature.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.extra.codegen.feature"
+      label="%featureName"
+      version="1.2.0.qualifier"
+      provider-name="%providerName">
+
+   <description url="http://www.example.com/description">
+      Base elements for code generation
+- Extension points
+- Manage file location (in which folders are generated files placed)
+- Support for text editors in model explorer
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2012 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>
+
+   <plugin
+         id="org.eclipse.papyrus.codegen.extensionpoints"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.codegen.base"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.texteditor.model"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.texteditor.modelexplorer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/license.html b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/license.html
new file mode 100644
index 00000000000..0fd3dd13aac
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.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/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/pom.xml
index 7fa0cbb9f7b..a9404e66e7b 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature/pom.xml
@@ -7,8 +7,8 @@
 		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../../releng/extra</relativePath>
 	</parent>
-	<artifactId>org.eclipse.papyrus.extra.cpp.feature</artifactId>
+	<artifactId>org.eclipse.papyrus.extra.codegen.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml
deleted file mode 100644
index 1dbca413afb..00000000000
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.cpp.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier">
-
-   <description url="http://www.example.com/description">
-      C++ code generation from Papyrus. The feature includes
-- A C++ profile, enabling the specification for C++ features, for instance: pointers, friends, constructor initializers
-- A code generator from UML enriched with the C++ profile
-- A C++ view allowing simple editing of opaque behaviors and manipulation of C++ profile attributes
-- An experimental CDT integration
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2012 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.cdt" version="8.4.0.201406031009"/>
-   </requires>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.cpp.codegen" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.cpp.codegen.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.cpp.profile" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.views.cpp" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.texteditor.cdt" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.texteditor.model" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.texteditor.modelexplorer" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.cpp.cdtproject" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.codegen.extensionpoints" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.cpp.examples" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.codegen.base" install-size="0" unpack="false" version="0.0.0"/>
-
-</feature>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
index 6957e49a20b..36affe70477 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
@@ -85,7 +85,11 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.papyrus.extra.cpp.feature"
+         id="org.eclipse.papyrus.extra.codegen.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.extra.codegen.cpp.feature"
          version="0.0.0"/>
 
    <includes
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml
index f4e493bb7cc..fc5af9caac4 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.qompass.designer.basic.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.extra.qompass.designer.basic.feature"
+      label="%featureName"
+      version="1.2.0.qualifier"
+      provider-name="%providerName">
 
    <description>
       The Qompass tool suite is a component based design methodology
@@ -30,22 +35,64 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <includes id="org.eclipse.papyrus.extra.cpp.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.extra.codegen.cpp.feature"
+         version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.qompass.designer.core" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.qompass.designer.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.qompass.designer.doc" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.qompass.designer.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.qompass.designer.validation" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.qompass.designer.validation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.qompass.modellibs.core" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.qompass.modellibs.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.qompass.designer.vsl" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.qompass.designer.vsl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.fcm.profile" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.fcm.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.qompass.designer.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.qompass.designer.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.qompass.designer.cpp" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.qompass.designer.cpp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
index 4bb9028c8fd..d1062f9cee6 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
@@ -49,7 +49,9 @@ http://www.eclipse.org/legal/epl-v10.html
 
    <includes id="org.eclipse.papyrus.extra.qompass.designer.tracing.source.feature" version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.extra.cpp.source.feature" version="0.0.0"/>
+   <includes id="org.eclipse.papyrus.extra.codegen.source.feature" version="0.0.0"/>
+
+   <includes id="org.eclipse.papyrus.extra.codegen.cpp.source.feature" version="0.0.0"/>
 
    <includes id="org.eclipse.papyrus.java.profile.source.feature" version="0.0.0"/>
 
@@ -57,4 +59,4 @@ http://www.eclipse.org/legal/epl-v10.html
 	
 	<includes id="org.eclipse.papyrus.migration.rsa.source.feature" version="0.0.0"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/releng/extra/pom.xml b/releng/extra/pom.xml
index 7d547132d8b..09691ca5398 100644
--- a/releng/extra/pom.xml
+++ b/releng/extra/pom.xml
@@ -14,7 +14,6 @@
 	<modules>
 		<!-- features -->
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature</module>
-		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature</module>
@@ -23,14 +22,9 @@
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature</module>
-		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature</module>
-		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature</module>
-		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature</module>
-		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature</module>
-		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.layers.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature</module>
@@ -41,9 +35,6 @@
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.effbd.feature</module>
 		
 		<!-- plug-ins-->
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.acceleo</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.acceleo.debug</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.acceleo.ui</module>
 		<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.core</module>
 		<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.ui</module>
 		<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties</module>
@@ -53,13 +44,6 @@
 		<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui</module>
 		<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems</module>
 		<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.codegen.base</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.cpp.examples</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.cpp.profile</module>
 		<module>../../plugins/customization/org.eclipse.papyrus.customization</module>
 		<module>../../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate</module>
 		<module>../../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit</module>
@@ -76,19 +60,6 @@
 		<module>../../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config</module>
 		<module>../../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu</module>
 		<module>../../extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types</module>
-		<module>../../extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile</module>
-		<module>../../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints</module>
-		<module>../../extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer</module>
-		<module>../../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt</module>
-		<module>../../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit</module>
-		<module>../../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor</module>
-		<module>../../extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt</module>
-		<module>../../extraplugins/java/org.eclipse.papyrus.java.generator.ui</module>
-		<module>../../extraplugins/java/org.eclipse.papyrus.java.profile</module>
-		<module>../../extraplugins/java/org.eclipse.papyrus.java.profile.edit</module>
-		<module>../../extraplugins/java/org.eclipse.papyrus.java.profile.editor</module>
-		<module>../../extraplugins/java/org.eclipse.papyrus.java.reverse</module>
-		<module>../../extraplugins/java/org.eclipse.papyrus.java.reverse.ui</module>
 		<module>../../extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit</module>
 		<module>../../extraplugins/layers/org.eclipse.papyrus.layers.runtime</module>
 		<module>../../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel</module>
@@ -105,15 +76,65 @@
 		<module>../../extraplugins/marte/org.eclipse.papyrus.marte.vsl</module>
 		<module>../../extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui</module>
 		<module>../../extraplugins/migration/org.eclipse.papyrus.migration.properties.model</module>
-		<module>../../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core</module>
-		<module>../../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp</module>
-		<module>../../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java</module>
-		<module>../../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc</module>
-		<module>../../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui</module>
-		<module>../../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation</module>
-		<module>../../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl</module>
-		<module>../../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core</module>
-		<module>../../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing</module>
+
+		<!-- Papyrus qompass -->
+		<module>../../extraplugins/qompass/org.eclipse.papyrus.qompass.ui</module>
+
+		<!-- Papyrus qompass/codegen -->
+		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature</module>
+		<module>../../extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base</module>
+		<module>../../extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints</module>
+		<module>../../extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model</module>
+		<module>../../extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer</module>
+
+		<!-- Papyrus qompass/codegen/cpp -->
+		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature</module>
+		<module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject</module>
+		<module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen</module>
+		<module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui</module>
+		<module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples</module>
+		<module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile</module>
+		<module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui</module>
+		<module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library</module>
+		<module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui</module>
+		<module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt</module>
+		<module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp</module>
+
+		<!-- Papyrus qompass/codegen/java -->
+		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature</module>
+		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature</module>
+		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature</module>
+		<module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer</module>
+		<module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt</module>
+		<module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit</module>
+		<module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor</module>
+		<module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt</module>
+		<module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui</module>
+		<module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile</module>
+		<module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit</module>
+		<module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor</module>
+		<module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse</module>
+		<module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui</module>
+
+		<!-- Papyrus qompass/designer -->
+		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature</module>
+		<module>../../extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile</module>
+
+		<module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core</module>
+		<module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp</module>
+		<module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java</module>
+		<module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc</module>
+		<module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui</module>
+		<module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation</module>
+		<module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl</module>
+		<module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core</module>
+		<module>../../extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing</module>
+
+		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature</module>
+		<module>../../extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints</module>
+		<module>../../extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints</module>
+
+		<!-- Papyrus RobotML -->
 		<module>../../extraplugins/robotml/org.eclipse.papyrus.robotml</module>
 		<module>../../extraplugins/robotml/org.eclipse.papyrus.robotml.deployment</module>
 		<module>../../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common</module>
@@ -125,9 +146,6 @@
 		<module>../../extraplugins/robotml/org.eclipse.papyrus.robotml.perspective</module>
 		<module>../../extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository</module>
 		<module>../../extraplugins/robotml/org.eclipse.papyrus.robotml.validation</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.texteditor.model</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer</module>
 		<module>../../extraplugins/uml/compare/org.eclipse.papyrus.uml.compare</module>
 		<module>../../extraplugins/uml/org.eclipse.papyrus.uml.export</module>
 		<module>../../extraplugins/uml/org.eclipse.papyrus.uml.diagram.dnd.smart</module>
@@ -153,8 +171,6 @@
 
 		<module>../../extraplugins/migration/org.eclipse.papyrus.m2m.qvto</module>
 		<module>../../extraplugins/migration/org.eclipse.papyrus.migration.rsa</module>
-		<module>../../extraplugins/codegen/org.eclipse.papyrus.views.cpp</module>
-		<module>../../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints</module>
 		<!-- Papyrus Uml Diagram Ecore -->
 		<module>../../extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.uml.diagram.ecore.feature</module>
diff --git a/releng/extra/site/category.xml b/releng/extra/site/category.xml
index b53462dceec..06db34d62bf 100644
--- a/releng/extra/site/category.xml
+++ b/releng/extra/site/category.xml
@@ -66,7 +66,10 @@
    <feature url="features/org.eclipse.papyrus.extra.eastadl.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.eastadl.feature" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.extra.others.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.extra.cpp.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.cpp.feature" version="1.2.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.extra.codegen.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.codegen.feature" version="1.2.0.qualifier">
+      <category name="org.eclipse.papyrus.extra.others.category"/>
+   </feature>
+   <feature url="features/org.eclipse.papyrus.extra.codegen.cpp.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.codegen.cpp.feature" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.extra.others.category"/>
    </feature>
    <feature url="features/org.eclipse.papyrus.extra.qompass.designer.basic.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.qompass.designer.basic.feature" version="1.2.0.qualifier">
@@ -99,7 +102,10 @@
    <feature url="features/org.eclipse.papyrus.migration.rsa.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.migration.rsa.feature.source" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.extra.others.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.extra.cpp.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.cpp.feature.source" version="1.2.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.extra.codegen.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.codegen.feature.source" version="1.2.0.qualifier">
+      <category name="org.eclipse.papyrus.extra.others.category"/>
+   </feature>
+   <feature url="features/org.eclipse.papyrus.extra.codegen.cpp.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.codegen.cpp.feature.source" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.extra.others.category"/>
    </feature>
    <feature url="features/org.eclipse.papyrus.uml.alf.extra.feature.source_0.7.0.qualifier.jar" id="org.eclipse.papyrus.uml.alf.extra.feature.source" version="0.7.0.qualifier">